Merge pull request #14563 from jakesmith/hpcc-25335-sasha-config-issues

HPCC-25335 Sasha config issue causing startup failures

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

dali/sasha/saserver.cpp

@@ -333,44 +333,44 @@ int main(int argc, const char* argv[])
     NoQuickEditSection x;
 #endif
 
-    serverConfig.setown(loadConfiguration(defaultYaml, argv, "sasha", "SASHA", "sashaconf.xml", nullptr));
-
-    Owned<IFile> sentinelFile;
+    bool enableSNMP = false;
 
-    stop = serverConfig->hasProp("@stop");
-    if (!stop)
+    try
     {
-        coalescer = serverConfig->hasProp("@coalesce");
-        if (coalescer)
-            force = serverConfig->hasProp("@force");
-        else
+        serverConfig.setown(loadConfiguration(defaultYaml, argv, "sasha", "SASHA", "sashaconf.xml", nullptr));
+
+        Owned<IFile> sentinelFile;
+
+        stop = serverConfig->hasProp("@stop");
+        if (!stop)
         {
-            sentinelFile.setown(createSentinelTarget());
-            removeSentinelFile(sentinelFile);
+            coalescer = serverConfig->hasProp("@coalesce");
+            if (coalescer)
+                force = serverConfig->hasProp("@force");
+            else
+            {
+                sentinelFile.setown(createSentinelTarget());
+                removeSentinelFile(sentinelFile);
+            }
         }
-    }
 
-#ifndef _CONTAINERIZED
-    StringBuffer logname;
-    StringBuffer logdir;
-    if (!stop)
-    {
-        Owned<IComponentLogFileCreator> lf = createComponentLogFileCreator(serverConfig, "sasha");
-        lf->setName("saserver");//override default filename
-        if (coalescer)
-            lf->setPostfix("coalesce");
-        lf->setMaxDetail(TopDetail);
-        lf->beginLogging();
-    }
-#else
-    setupContainerizedLogMsgHandler();
-#endif
-    DBGLOG("Build %s", BUILD_TAG);
-
-    bool enableSNMP = false;
+    #ifndef _CONTAINERIZED
+        StringBuffer logname;
+        StringBuffer logdir;
+        if (!stop)
+        {
+            Owned<IComponentLogFileCreator> lf = createComponentLogFileCreator(serverConfig, "sasha");
+            lf->setName("saserver");//override default filename
+            if (coalescer)
+                lf->setPostfix("coalesce");
+            lf->setMaxDetail(TopDetail);
+            lf->beginLogging();
+        }
+    #else
+        setupContainerizedLogMsgHandler();
+    #endif
+        DBGLOG("Build %s", BUILD_TAG);
 
-    try
-    {
         unsigned short port = serverConfig->getPropInt("@port");
         if (!port)
         {

helm/hpcc/templates/_helpers.tpl

@@ -677,7 +677,7 @@ data:
 {{- $categories := list "system" -}}
 {{- if has "data" .me.access -}}
 {{- $categories := append $categories "storage" -}}
-{{- end -}}
+{{- end }}
 {{ include "hpcc.generateVaultConfig" (dict "root" .root "categories" $categories ) | indent 6 }}
 {{- if .me.storage }}
       storagePath: {{ include "hpcc.getVolumeMountPrefix" (dict "root" .root "name" (printf "sasha-%s" .me.service) "me" .me.storage) }}

helm/hpcc/templates/dali.yaml

@@ -76,7 +76,7 @@ data:
 {{- if not .disabled -}}
 {{- $_ := set . "access" (splitList " " (include "hpcc.getSashaServiceAccess" .)) -}}
 kind: ConfigMap
-{{- with (. | merge (pick $daliScope "logging")) }}
+{{- with (. | merge (pick $daliScope "logging") | merge (dict "inDaliPod" true)) }}
 {{ include "hpcc.sashaConfigMap" (dict "root" $ "me" .) }}
 {{- end }}
 ---