Merge remote-tracking branch 'origin/candidate-9.4.x'

hpcc-systems · Jan 4, 2024 · 278b37c · 278b37c
2 parents b868b59 + 5b3b734
commit 278b37c
Show file tree

Hide file tree

Showing 70 changed files with 2,444 additions and 3,842 deletions.
diff --git a/common/workunit/workunit.cpp b/common/workunit/workunit.cpp
@@ -14253,16 +14253,16 @@ void executeThorGraph(const char * graphName, IConstWorkUnit &workunit, const IP
         unsigned runningTimeLimit = workunit.getDebugValueInt("maxRunTime", 0);
         runningTimeLimit = runningTimeLimit ? runningTimeLimit : INFINITE;
 
-        std::list<WUState> expectedStates = { WUStateRunning, WUStateWait };
+        std::list<WUState> expectedStates = { WUStateRunning, WUStateWait, WUStateFailed };
         unsigned __int64 blockedTime = 0;
         for (unsigned i=0; i<2; i++)
         {
             WUState state = waitForWorkUnitToComplete(wuid, timelimit*1000, expectedStates);
             DBGLOG("Got state: %s", getWorkunitStateStr(state));
-            if (WUStateWait == state) // already finished
+            if ((WUStateWait == state) || (WUStateFailed == state)) // already finished or failed
             {
                 // workunit may have spent time in blocked state, but then transitioned to
-                // wait state quickly such that this code did not see its running state.
+                // wait or failed state quickly such that this code did not see its running state.
                 if (!blockedTime)
                     blockedTime = elapsedTimer.elapsedNs();
                 break;

diff --git a/dali/ft/filecopy.cpp b/dali/ft/filecopy.cpp
@@ -3715,7 +3715,8 @@ void FileSprayer::updateTargetProperties()
             ForEach(*iter)
             {
                 const char *aname = iter->query().queryName();
-                if (stricmp(aname, "Protect") != 0)
+                if (!(strieq(aname, "Protect")||
+                      strieq(aname, "_remoteStoragePlane")))
                     curProps.addPropTree(aname, createPTreeFromIPT(&iter->query()));
             }
 

diff --git a/docs/common/Version.xml b/docs/common/Version.xml
@@ -5,11 +5,11 @@
   <chapterinfo>
     <date id="DateVer">DEVELOPER NON-GENERATED VERSION</date>
 
-    <releaseinfo id="FooterInfo">© 2023 HPCC
+    <releaseinfo id="FooterInfo">© 2024 HPCC
     Systems<superscript>®</superscript>. All rights reserved</releaseinfo>
 
     <copyright id="Copyright">
-      <year>2023 HPCC Systems<superscript>®</superscript>. All rights
+      <year>2024 HPCC Systems<superscript>®</superscript>. All rights
       reserved</year>
     </copyright>
   </chapterinfo>
@@ -23,9 +23,9 @@
     serve one purpose and that is to store the chapterinfo and other information
     used by several document components.</para>
 
-    <para id="CHMVer">2023 Version ${DOC_VERSION}</para>
+    <para id="CHMVer">2024 Version ${DOC_VERSION}</para>
 
-    <remark id="YrVer">2023</remark>
+    <remark id="YrVer">2024</remark>
 
     <para>The following line is the code to be put into the document you wish
     to include the above version info in:</para>

diff --git a/docs/common/Version.xml.in b/docs/common/Version.xml.in
@@ -3,13 +3,13 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <chapter>
   <chapterinfo>
-    <date id="DateVer">2023 Version ${DOC_VERSION}</date>
+    <date id="DateVer">2024 Version ${DOC_VERSION}</date>
 
-    <releaseinfo id="FooterInfo">© 2023 HPCC
+    <releaseinfo id="FooterInfo">© 2024 HPCC
     Systems<superscript>®</superscript>. All rights reserved</releaseinfo>
 
     <copyright id="Copyright">
-      <year>2023 HPCC Systems<superscript>®</superscript>. All rights
+      <year>2024 HPCC Systems<superscript>®</superscript>. All rights
       reserved</year>
     </copyright>
   </chapterinfo>
@@ -24,9 +24,9 @@
     serve one purpose and that is to store the chapterinfo the above sections
     that are being used by several other documents.</para>
 
-    <para id="CHMVer">2023 Version ${DOC_VERSION}</para>
+    <para id="CHMVer">2024 Version ${DOC_VERSION}</para>
 
-    <remark id="YrVer">2023</remark>
+    <remark id="YrVer">2024</remark>
 
     <para>The following line is the code to be put into the document you wish
     to include the above version info in:</para>

diff --git a/esp/src/eclwatch/css/hpcc.css b/esp/src/eclwatch/css/hpcc.css
@@ -1952,4 +1952,9 @@ span.dijitReset.dijitInline.dijitIcon.fa.disabled {
 .flat .p-TabBar-tab.p-mod-current {
     background-color: var(--colorNeutralBackground1);
     border-bottom-color: var(--colorNeutralStroke1);
+}
+
+.flat .chart_Axis .axis .tick line,
+.flat .chart_Axis .axis path.domain {
+    stroke: var(--colorNeutralStroke1);
 }