浏览代码

Merge pull request #13551 from jakesmith/hpcc-23775-copySection

HPCC-23775 Move copySection to slow command throttler

Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 年之前
父节点
当前提交
22a95c062b
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      fs/dafsclient/rmtfile.cpp
  2. 1 1
      fs/dafsserver/dafsserver.cpp

+ 1 - 1
fs/dafsclient/rmtfile.cpp

@@ -1570,7 +1570,7 @@ IFileIO * CRemoteFile::open(IFOmode mode,IFEflags extraFlags)
 void CRemoteFile::copyTo(IFile *dest, size32_t buffersize, ICopyFileProgress *progress, bool usetmp, CFflags copyFlags)
 {
     CRemoteFile *dstfile = QUERYINTERFACE(dest,CRemoteFile);
-    if (dstfile&&!dstfile->queryEp().isLocal()) {
+    if (dstfile&&(!dstfile->queryEp().isLocal() || (dstfile->queryEp().port!=DAFILESRV_PORT && dstfile->queryEp().port!=SECURE_DAFILESRV_PORT))) {
         StringBuffer tmpname;
         Owned<IFile> destf;
         RemoteFilename dest;

+ 1 - 1
fs/dafsserver/dafsserver.cpp

@@ -4727,6 +4727,7 @@ public:
             case RFCtreecopy:
             case RFCtreecopytmp:
             case RFCremove:
+            case RFCcopysection:
                 slowCmdThrottler.addCommand(cmd, msg, client);
                 return;
             case RFCcloseIO:
@@ -4766,7 +4767,6 @@ public:
             // NB: The following commands are still bound by the the thread pool
             case RFCsetthrottle: // legacy version
             case RFCsetthrottle2:
-            case RFCcopysection: // slightly odd, but has it's own limit
             default:
             {
                 client->processCommand(cmd, msg, NULL);