Revisionism

distributed-system-analysis · Apr 4, 2023 · ee1cf97 · ee1cf97
1 parent 7ac1626
commit ee1cf97
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/lib/pbench/cli/server/shell.py b/lib/pbench/cli/server/shell.py
@@ -77,14 +77,14 @@ def run_gunicorn(server_config: PbenchServerConfig, logger: Logger) -> int:
     try:
         wait_for_uri(db_uri, db_wait_timeout)
     except BadConfig as exc:
+        logger.error(f"{exc}")
         notifier.notify("STOPPING=1")
         notifier.notify(f"STATUS=Bad DB config {exc}")
-        logger.error(f"{exc}")
         return 1
     except ConnectionRefusedError:
+        logger.error("Database {} not responding", db_uri)
         notifier.notify("STOPPING=1")
         notifier.notify("STATUS=DB not responding")
-        logger.error("Database {} not responding", db_uri)
         return 1
 
     notifier.notify("STATUS=Waiting for Elasticsearch instance")
@@ -96,23 +96,23 @@ def run_gunicorn(server_config: PbenchServerConfig, logger: Logger) -> int:
     try:
         wait_for_uri(es_uri, es_wait_timeout)
     except BadConfig as exc:
+        logger.error(f"{exc}")
         notifier.notify("STOPPING=1")
         notifier.notify(f"STATUS=Bad index config {exc}")
-        logger.error(f"{exc}")
         return 1
     except ConnectionRefusedError:
+        logger.error("Index {} not responding", es_uri)
         notifier.notify("STOPPING=1")
         notifier.notify("STATUS=Index service not responding")
-        logger.error("Index {} not responding", es_uri)
         return 1
 
     notifier.notify("STATUS=Initializing OIDC")
     try:
         oidc_server = OpenIDClient.wait_for_oidc_server(server_config, logger)
     except OpenIDClient.NotConfigured as exc:
+        logger.warning("OpenID Connect client not configured, {}", exc)
         notifier.notify("STOPPING=1")
         notifier.notify("STATUS=OPENID broker not responding")
-        logger.warning("OpenID Connect client not configured, {}", exc)
     else:
         logger.info("Pbench server using OIDC server {}", oidc_server)
 
@@ -126,9 +126,9 @@ def run_gunicorn(server_config: PbenchServerConfig, logger: Logger) -> int:
     try:
         init_db(server_config, logger)
     except (NoOptionError, NoSectionError) as exc:
+        logger.error("Invalid database configuration: {}", exc)
         notifier.notify("STOPPING=1")
         notifier.notify(f"STATUS=Error initializing database: {exc}")
-        logger.error("Invalid database configuration: {}", exc)
         return 1
 
     # Multiple cron jobs will attempt to file reports with the Elasticsearch
@@ -141,9 +141,9 @@ def run_gunicorn(server_config: PbenchServerConfig, logger: Logger) -> int:
     try:
         init_indexing(PROG, server_config, logger)
     except (NoOptionError, NoSectionError) as exc:
+        logger.error("Invalid indexing configuration: {}", exc)
         notifier.notify("STOPPING=1")
         notifier.notify(f"STATUS=Invalid indexing config {exc}")
-        logger.error("Invalid indexing configuration: {}", exc)
         return 1
 
     notifier.notify("READY=1")

diff --git a/lib/pbench/test/unit/server/test_shell_cli.py b/lib/pbench/test/unit/server/test_shell_cli.py
@@ -317,7 +317,6 @@ def get_server_config() -> PbenchServerConfig:
             "wait_timeout",
             "workers",
             "worker_timeout",
-            "crontab-dir",
         ],
     )
     def test_main_server_config_no_option(
@@ -329,8 +328,6 @@ def get_server_config() -> PbenchServerConfig:
             section = (
                 "database"
                 if option in frozenset(("uri", "wait_timeout"))
-                else "DEFAULT"
-                if option == "crontab-dir"
                 else "pbench-server"
             )
             make_logger.error(config._conf[section][option])

diff --git a/...er/lib/pbench/system/pbench-index.service → server/lib/systemd/pbench-index.service b/...er/lib/pbench/system/pbench-index.service → server/lib/systemd/pbench-index.service
diff --git a/server/lib/pbench/system/pbench-index.timer → server/lib/systemd/pbench-index.timer b/server/lib/pbench/system/pbench-index.timer → server/lib/systemd/pbench-index.timer
diff --git a/server/pbenchinacan/container-build.sh b/server/pbenchinacan/container-build.sh
@@ -68,10 +68,10 @@ buildah copy --chown root:root --chmod 0644 $container \
 buildah run $container rm /etc/logrotate.d/nginx
 
 # Setup the Pbench Server systemd service.
-buildah run $container cp ${SERVER_LIB}/systemd/pbench-server.service \
-    /etc/systemd/system/pbench-server.service
-buildah run $container cp ${SERVER_LIB}/pbench/system/pbench-index.service \
-    ${SERVER_LIB}/pbench/system/pbench-index.timer \
+buildah run $container cp \
+    ${SERVER_LIB}/systemd/pbench-server.service \
+    ${SERVER_LIB}/systemd/pbench-index.service \
+    ${SERVER_LIB}/systemd/pbench-index.timer \
     /etc/systemd/system/
 
 buildah run $container systemctl enable nginx