From c026cf4c6210711cdfb73ac0a89984b971af1a6a Mon Sep 17 00:00:00 2001
From: Mike Hibler <hibler@cs.utah.edu>
Date: Thu, 13 Mar 2025 06:48:47 -0600
Subject: [PATCH] Reflect swap of Ustar/Wasatch, avoid uninitialized vars
---
powder/wr-monitor.in | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/powder/wr-monitor.in b/powder/wr-monitor.in
index cbae7e1e47..7fa615f813 100644
--- a/powder/wr-monitor.in
+++ b/powder/wr-monitor.in
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# Copyright (c) 2023-2024 University of Utah and the Flux Group.
+# Copyright (c) 2023-2025 University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
@@ -175,11 +175,11 @@ my %WRNODES = (
"10.11.13.242" => {
"enabled" => 1,
"type" => "len",
- "name" => "wr-len-8",
- "alias" => "wr-len-wasatch-dbs",
- "location" => "Wasatch DBS LEN",
- "pcenabled" => 0,
- "pcname" => "wrlen-dbs1",
+ "name" => "wr-len-14",
+ "alias" => "wr-len-ustar-dbs",
+ "location" => "Ustar DBS LEN",
+ "pcenabled" => 1,
+ "pcname" => "wrlen-dbs8",
},
"10.11.13.243" => {
"enabled" => 0,
@@ -227,13 +227,13 @@ my %WRNODES = (
"pcname" => "wrlen-dbs6",
},
"10.11.13.248" => {
- "enabled" => 1,
+ "enabled" => 0,
"type" => "len",
- "name" => "wr-len-14",
- "alias" => "wr-len-ustar-dbs",
- "location" => "Ustar DBS LEN",
- "pcenabled" => 1,
- "pcname" => "wrlen-dbs8",
+ "name" => "wr-len-8",
+ "alias" => "wr-len-wasatch-dbs",
+ "location" => "Wasatch DBS LEN",
+ "pcenabled" => 0,
+ "pcname" => "wrlen-dbs1",
},
);
@@ -684,6 +684,9 @@ sub wrzen_getstatus()
print ">>>>> SSH OUTPUT\n", @output, "\n<<<<< OUTPUT END\n"
if ($debug > 1);
+ $status{'global'} = $status{'timing'} = $status{'system'} =
+ $status{'fpga-temp'} = "DNR";
+
foreach my $line (@output) {
chomp($line);
if ($line =~ /sys\/fpga_temp\s+:\s+(\d+)\s+/) {
--
GitLab