HPCC-30570 Revise based on review

Signed-off-by: wangkx <[email protected]>
hpcc-systems · Dec 5, 2023 · 5787da2 · 5787da2
1 parent 4d16d77
commit 5787da2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/esp/services/ws_fs/ws_fsService.cpp b/esp/services/ws_fs/ws_fsService.cpp
@@ -2695,11 +2695,19 @@ bool CFileSprayEx::onCopy(IEspContext &context, IEspCopy &req, IEspCopyResponse
         const char* destNodeGroupReq = req.getDestGroup();
         if(isEmptyString(destNodeGroupReq))
         {
-            if(isContainerized() && !isEmptyString(srcDali))
+            CDfsLogicalFileName lfn;
+            lfn.set(srcname);
+            if(!isEmptyString(srcDali) || lfn.isForeign() || lfn.isRemote())
+            {
+                //makes no sense to get the srcname's current group, if a logical file is from a different environment.
                 getDefaultStoragePlane(destNodeGroup);
+                DBGLOG("Destination node group not specified, using default node group %s", destNodeGroup.str());
+            }
             else
+            {
                 getNodeGroupFromLFN(context, srcname, destNodeGroup);
-            DBGLOG("Destination node group not specified, using source node group %s", destNodeGroup.str());
+                DBGLOG("Destination node group not specified, using source node group %s", destNodeGroup.str());
+            }
         }
         else
         {

diff --git a/esp/smc/SMCLib/CMakeLists.txt b/esp/smc/SMCLib/CMakeLists.txt
@@ -67,6 +67,7 @@ include_directories (
          ./../../bindings/SOAP/xpp 
          ./.. 
          ${HPCC_SOURCE_DIR}/common/thorhelper
+         ${HPCC_SOURCE_DIR}/esp/clients/ws_dfsclient
     )
 
 ADD_DEFINITIONS( -D_USRDLL -DSMCLIB_EXPORTS -DWSWU_API_LOCAL -DWsResources_API_LOCAL )
@@ -84,7 +85,8 @@ target_link_libraries ( SMCLib
          nbcd 
          eclrtl 
          deftype 
-         workunit 
+         workunit
+         ws_dfsclient
     )
 
 if (NOT CONTAINERIZED)

diff --git a/esp/smc/SMCLib/LogicFileWrapper.cpp b/esp/smc/SMCLib/LogicFileWrapper.cpp
@@ -22,6 +22,7 @@
 #include "LogicFileWrapper.hpp"
 #include "dautils.hpp"
 #include "exception_util.hpp"
+#include "ws_dfsclient.hpp"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -107,7 +108,7 @@ IDistributedFile* lookupLogicalName(IEspContext& context, const char* logicalNam
         userDesc->set(userID, context.queryPassword(), context.querySignature());
     }
 
-    Owned<IDistributedFile> df = queryDistributedFileDirectory().lookup(logicalName, userDesc, accessMode,
+    Owned<IDistributedFile> df = wsdfs::lookup(logicalName, userDesc, accessMode,
         hold, lockSuperOwner, transaction, privilegedUser, timeout);
     return df.getClear();
 }