Changeset 35984 for trunk/ippm/FilesMonitoring/Supervision

Timestamp:

Aug 20, 2013, 6:17:32 PM (13 years ago)

Author:

watersc1

Message:

I'm going to commit before I start moving everything around so that they're sane.

Location:

trunk/ippm/FilesMonitoring/Supervision

Files:

• cluster_status.py (modified) (5 diffs)
• node_status.py (modified) (3 diffs)

trunk/ippm/FilesMonitoring/Supervision/cluster_status.py

@@ -9 +9 @@
 toGigs = 1024.**3
 toGigsFromK = 1024.**2
+
+bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
 
 def usage():
@@ -47 +50 @@
         sql_check = True
     elif argv[1] == 'mhpcc':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -86 +89 @@
                   "stsci07.0", "stsci07.1", "stsci07.2",
                   "stsci08.0", "stsci08.1", "stsci08.2",
-                  "stsci09.0", "stsci09.1", "stsci09.2", ]
+                  "stsci09.0", "stsci09.1", "stsci09.2",
+                  "stsci10.0", "stsci10.1", "stsci10.2",
+                  "stsci11.0", "stsci11.1", "stsci11.2",
+                  "stsci12.0", "stsci12.1", "stsci12.2",
+                  "stsci13.0", "stsci13.1", "stsci13.2",
+                  "stsci14.0", "stsci14.1", "stsci14.2",
+                  "stsci15.0", "stsci15.1", "stsci15.2",
+                  "stsci16.0", "stsci16.1", "stsci16.2",
+                  "stsci17.0", "stsci17.1", "stsci17.2",
+                  "stsci18.0", "stsci18.1", "stsci18.2",
+                  "stsci19.0", "stsci19.1", "stsci19.2", ]
     elif argv[1] == 'all':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -106 +119 @@
                         "stsci07.0", "stsci07.1", "stsci07.2",
                         "stsci08.0", "stsci08.1", "stsci08.2",
-                        "stsci09.0", "stsci09.1", "stsci09.2", ])
+                        "stsci09.0", "stsci09.1", "stsci09.2", 
+                        "stsci10.0", "stsci10.1", "stsci10.2",
+                        "stsci11.0", "stsci11.1", "stsci11.2",
+                        "stsci12.0", "stsci12.1", "stsci12.2",
+                        "stsci13.0", "stsci13.1", "stsci13.2",
+                        "stsci14.0", "stsci14.1", "stsci14.2",
+                        "stsci15.0", "stsci15.1", "stsci15.2",
+                        "stsci16.0", "stsci16.1", "stsci16.2",
+                        "stsci17.0", "stsci17.1", "stsci17.2",
+                        "stsci18.0", "stsci18.1", "stsci18.2",
+                        "stsci19.0", "stsci19.1", "stsci19.2", ]
     else:
         nodes = [ ]
@@ -138 +161 @@
 
 def is_update_running(node):
-    p = subprocess.Popen( ['/home/panstarrs/schastel/dev/FilesMonitoring/Supervision/node_status.py', node],
+    p = subprocess.Popen( ['%s/node_status.py' % bin_directory, node],
                           stderr = subprocess.PIPE,
                           stdout = subprocess.PIPE)

trunk/ippm/FilesMonitoring/Supervision/node_status.py

@@ -10 +10 @@
 import datetime
 
+bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+node_directory = '/export/%s/ipp_filemon/'
+
 def process_arguments(argv):
     if len(argv) == 1:
@@ -15 +19 @@
         sys.exit(1)
     elif argv[1] == 'all':
-        nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes'
+        nodesFilename = '%s/ippMhpccStorageNodes' % share_directory
         nodesFile = open(nodesFilename)
         nodes = []
@@ -45 +49 @@
 
 def get_seconds_since_last_message(ssh, node):
-    logfilename = '/export/%s/schastel/logs/%s_refresh.log' % (node, node)
+    logfilename = ('%s/%s' % (node_directory, '/logs/%s_refresh.log') % (node, node))
     stdin, stdout, stderr = ssh.exec_command('tail -n 1 %s' % (logfilename))
     for line in stdout: