Merge remote-tracking branch 'origin/candidate-3.10.2' into candidate-3.10.x

Conflicts:
	version.cmake

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

ecl/hqlcpp/hqlresource.cpp

@@ -2577,6 +2577,8 @@ static bool isPotentialCompoundSteppedIndexRead(IHqlExpression * expr)
         case no_compound_indexread:
         case no_newkeyindex:
             return true;
+        case no_getgraphloopresult:
+            return true; // Could be an index read in another graph iteration, so don't combine
         case no_keyedlimit:
         case no_preload:
         case no_filter:

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -1586,7 +1586,7 @@ bool CWsWorkunitsEx::onWUGetDependancyTrees(IEspContext& context, IEspWUGetDepen
 
         MemoryBuffer temp;
         MemoryBuffer2IDataVal xmlresult(temp);
-        Owned<IConstWUResult> result = wu->getResultBySequence(0);
+        Owned<IConstWUResult> result = cw->getResultBySequence(0);
         if (result)
         {
             result->getResultRaw(xmlresult, NULL, NULL);

initfiles/bash/etc/init.d/hpcc_common.in

@@ -361,25 +361,38 @@ createRuntime() {
     fi
 
     #change the permission for all component directory under var
+    echo `date` "start chown $pid/$compName" >> /var/log/HPCCSystems/temp_log
     chown -cR $user:$group "$pid/$compName"  1> /dev/null 2>/dev/null
+    echo `date` "stop chown $pid/$compName" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown $lock/$compName" >> /var/log/HPCCSystems/temp_log
     chown -cR $user:$group "$lock/$compName"  1> /dev/null 2>/dev/null
+    echo `date` "stop chown $lock/$compName" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown $log/$compName" >> /var/log/HPCCSystems/temp_log
     chown -cR $user:$group "$log/$compName"  1> /dev/null 2>/dev/null
+    echo `date` "stop chown $log/$compName" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown $compPath" >> /var/log/HPCCSystems/temp_log
     chown -cR $user:$group "$compPath"  1> /dev/null 2>/dev/null
-    
+    echo `date` "stop chown $compPath" >> /var/log/HPCCSystems/temp_log
     dir.getByName data
+    echo `date` "start chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
     chown -cR $user:$group "${dir_return}"  1> /dev/null 2>/dev/null
-
+    echo `date` "stop chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
     dir.getByName data2
     chown -cR $user:$group "${dir_return}"  1> /dev/null 2>/dev/null
-
+    echo `date` "stop chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
     dir.getByName data3
     chown -cR $user:$group "${dir_return}"  1> /dev/null 2>/dev/null
-
+    echo `date` "stop chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
     dir.getByName query
     chown -cR $user:$group "${dir_return}"  1> /dev/null 2>/dev/null
-
+    echo `date` "stop chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
+    echo `date` "start chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
     dir.getByName mirror
     chown -cR $user:$group "${dir_return}"  1> /dev/null 2>/dev/null
+    echo `date` "stop chown ${dir_return}" >> /var/log/HPCCSystems/temp_log
 
     # setting up ulimit for thor and other component which needs it.
     ulimit -n 32768

initfiles/componentfiles/thor/start_slaves

@@ -35,7 +35,9 @@ fi
 # this must match jsocket hard limit
 export handlelimit=32768
 
+echo `date` Initializing dafilesrv setup
 sudo /etc/init.d/hpcc-init -c dafilesrv setup
+echo `date` Dafilesrv setup done
 mkdir -p $instancedir
 mkdir -p `dirname $logredirect`
 exec >>$logredirect 2>&1