HPCC-31269 Fix roxie meta data copy from k8s bug.

HPCC-30996 introduced a new mechanism/format to copy meta data when reading files from a k8s system. That change targeted 8.12. However, after it was upmerged to 9.4, some key fields in the meta data were skipped and no longer being copied, causing the new meta data not to be used by roxie. Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Feb 9, 2024 · 1993090 · 1993090
1 parent 0e38230
commit 1993090
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/dali/dfu/dfuutil.cpp b/dali/dfu/dfuutil.cpp
@@ -421,8 +421,15 @@ class CFileCloner
             // JCSMORE: it may be this can replace the need for the other 'clone*' attributes altogether.
             if (srcfdesc->queryProperties().hasProp("_remoteStoragePlane"))
             {
-                attrs.setPropTree("cloneFromFDesc", createPTreeFromIPT(srcTree));
-                return;
+                if (srcdali && !srcdali->endpoint().isNull())
+                {
+                    attrs.setPropTree("cloneFromFDesc", createPTreeFromIPT(srcTree));
+                    StringBuffer host;
+                    attrs.setProp("@cloneFrom", srcdali->endpoint().getEndpointHostText(host).str());
+                    if (prefix.length())
+                        attrs.setProp("@cloneFromPrefix", prefix.get());
+                    return;
+                }
             }
 
             while(attrs.removeProp("cloneFromGroup"));