Changeset 41302 for trunk/ippMonitor

Timestamp:

Mar 2, 2020, 2:04:01 PM (6 years ago)

Author:

tdeboer

Message:

Adding czarpoll backup flag and related behaviour

Location:

trunk/ippMonitor/czartool

Files:

• czarconfig.xml.in (modified) (1 diff)
• czarpoll.pl (modified) (2 diffs)
• czartool/Config.pm (modified) (2 diffs)

trunk/ippMonitor/czartool/czarconfig.xml.in

@@ -17 +17 @@
     <savelocation>PATH/TO/ippMetrics</savelocation>
     <starttime>18:00</starttime>
+    <backupversion>0</backupversion>
   </metrics>
 

trunk/ippMonitor/czartool/czarpoll.pl

@@ -292 +292 @@
     my $yesterday = undef;
     my $newDayTime = $config->getMetricsStartTime();
+    my $metricsbackupversion = $config->getMetricsBackupVersion();
     my $lastDayDailyTasks = "2010-01-01";
     my $checkneb = 1; # 1 for nebulous, 0 for localhost test
@@ -346 +347 @@
 
                 # now cleanup tables from yesterday and optimize
-                #TdB20190703: The ipp113 and ipp117 instances of czarpoll use the same stage DBs in czarDB. 
-                #Therefore, it makes no sense to run the cleanup+optimising twice
+                # TdB20190703: The ipp113 and ipp117 instances of czarpoll use the same stage DBs in czarDB. 
+                # Therefore, ensure DB optimising happens only in the regular version.
                 print "* Performing database cleanup\n";
                 $czarDb->cleanupDateRange($yesterday, $yesterday, $config->getCzarCleanupInterval());
-                #print "* Optimizing the database\n";
-                #$czarDb->optimize();
+                if($metricsbackupversion == 0) {
+                    print "* Optimizing the database\n";
+                    $czarDb->optimize();
+                }
                 $lastDayDailyTasks = $yesterday;
             }

trunk/ippMonitor/czartool/czartool/Config.pm

@@ -51 +51 @@
     $self->{metricssavelocation} = $xc->findvalue('//metrics/savelocation');
     $self->{metricsstarttime} = $xc->findvalue('//metrics/starttime');
+    $self->{metricsbackupversion} = $xc->findvalue('//metrics/backupversion');
 
     # gpc1 db
@@ -247 +248 @@
 ###########################################################################
 #
+# Returns flag setting backup version of czartool
+#
+###########################################################################
+sub getMetricsBackupVersion {
+    my ($self) = @_;
+    return $self->{metricsbackupversion};
+}
+
+###########################################################################
+#
 # Returns name for gpc1 Db
 #