Merge branch 'closedown-4.2.x' into candidate-5.0.0

Conflicts:
	roxie/ccd/ccd.hpp

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/workunit/referencedfilelist.cpp

@@ -123,7 +123,8 @@ class ReferencedFile : public CInterface, implements IReferencedFile
 {
 public:
     IMPLEMENT_IINTERFACE;
-    ReferencedFile(const char *lfn, const char *sourceIP, const char *srcCluster, const char *prefix, bool isSubFile, unsigned _flags, const char *_pkgid, bool noDfs) : flags(_flags), pkgid(_pkgid), noDfsResolution(noDfs)
+    ReferencedFile(const char *lfn, const char *sourceIP, const char *srcCluster, const char *prefix, bool isSubFile, unsigned _flags, const char *_pkgid, bool noDfs)
+    : flags(_flags), pkgid(_pkgid), noDfsResolution(noDfs)
     {
         logicalName.set(skipForeign(lfn, &daliip)).toLowerCase();
         if (daliip.length())
@@ -520,7 +521,7 @@ void ReferencedFileList::ensureFile(const char *ln, unsigned flags, const char *
 
 void ReferencedFileList::addFile(const char *ln, const char *daliip, const char *srcCluster, const char *prefix)
 {
-    ensureFile(ln, 0, NULL, daliip, srcCluster, prefix);
+    ensureFile(ln, 0, NULL, false, daliip, srcCluster, prefix);
 }
 
 void ReferencedFileList::addFiles(StringArray &files)
@@ -611,7 +612,7 @@ void ReferencedFileList::addFilesFromQuery(IConstWorkUnit *cw, const IHpccPackag
                         {
                             StringBuffer subfile;
                             ssfe->getSubFileName(count, subfile);
-                            ensureFile(subfile, RefSubFile | RefFileInPackage, pkgid, pkg->isCompulsory());
+                            ensureFile(subfile, RefSubFile | RefFileInPackage, pkgid, false);
                         }
                     }
                 }

roxie/ccd/ccd.hpp

@@ -118,7 +118,7 @@ extern unsigned myNodeIndex;
 #define DEBUGREQUEST_TIMEOUT 5000
 #endif
 
-#define ROXIE_DALI_CONNECT_TIMEOUT 5000
+#define ROXIE_DALI_CONNECT_TIMEOUT 30000
 #define ABORT_POLL_PERIOD 5000
 
 class RemoteActivityId

roxie/ccd/ccdstate.cpp

@@ -1710,7 +1710,10 @@ public:
     CRoxiePackageSetManager(const IQueryDll *_standAloneDll) :
         autoReloadThread(*this), standAloneDll(_standAloneDll)
     {
-        daliHelper.setown(connectToDali(ROXIE_DALI_CONNECT_TIMEOUT));
+        if (topology && topology->getPropBool("@lockDali", false))
+            daliHelper.setown(connectToDali());
+        else
+            daliHelper.setown(connectToDali(ROXIE_DALI_CONNECT_TIMEOUT));
         atomic_set(&autoPending, 0);
         autoReloadThread.start();
         pSetsNotifier.setown(daliHelper->getPackageSetsSubscription(this));