Bladeren bron

AMBARI-5249. disk_total sometimes returns 0.(vbrodetskyi)

Vitaly Brodetskyi 11 jaren geleden
bovenliggende
commit
27e35262b6

+ 1 - 2
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_monitor.py

@@ -121,8 +121,7 @@ class GangliaMonitor(Script):
                       owner = "root",
                       group = params.user_group)
 
-    if params.pure_slave:
-      generate_daemon("gmond",
+    generate_daemon("gmond",
                     name = "HDPSlaves",
                     role = "monitor",
                     owner = "root",

+ 21 - 0
ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_monitor.py

@@ -138,6 +138,13 @@ class TestGangliaMonitor(RMFTestCase):
                                     '/bin',
                                     '/usr/bin'],
                             )
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -o root -g hadoop',
+                              path = ['/usr/libexec/hdp/ganglia',
+                                      '/usr/sbin',
+                                      '/sbin:/usr/local/bin',
+                                      '/bin',
+                                      '/usr/bin'],
+                              )
     self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
                               owner = 'root',
                               group = 'hadoop',
@@ -294,6 +301,14 @@ class TestGangliaMonitor(RMFTestCase):
                 '/bin',
                 '/usr/bin'],
         )
+    self.assertResourceCalled(
+        'Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -o root -g hadoop',
+        path = ['/usr/libexec/hdp/ganglia',
+                '/usr/sbin',
+                '/sbin:/usr/local/bin',
+                '/bin',
+                '/usr/bin'],
+        )
     self.assertResourceCalled(
         'Directory', '/etc/ganglia/conf.d',
         owner = 'root',
@@ -447,6 +462,12 @@ class TestGangliaMonitor(RMFTestCase):
                                   '/bin',
                                   '/usr/bin'],)
 
+    self.assertResourceCalled('Execute', '/usr/libexec/hdp/ganglia/setupGanglia.sh -c HDPSlaves -o root -g hadoop',
+                              path = ['/usr/libexec/hdp/ganglia',
+                                      '/usr/sbin',
+                                      '/sbin:/usr/local/bin',
+                                      '/bin',
+                                      '/usr/bin'],)
     self.assertResourceCalled('Directory', '/etc/ganglia/conf.d',
                           owner = 'root',
                           group = 'hadoop',)