Bläddra i källkod

AMBARI-7567. Modify Slider service definition to handle versioned rpms and new path naming scheme

Sumit Mohanty 10 år sedan
förälder
incheckning
1acb739586

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml

@@ -57,7 +57,7 @@
           <osFamily>any</osFamily>
           <packages>
             <package>
-              <name>slider</name>
+              <name>slider_2_2_0_0_*</name>
             </package>
           </packages>
         </osSpecific>

+ 3 - 6
ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py

@@ -28,14 +28,11 @@ rpm_version = default("/configurations/cluster-env/rpm_version", None)
 
 #hadoop params
 if rpm_version:
-#  slider_conf_dir = '/usr/lib/current/slider/conf'
-#  slider_bin_dir = '/usr/lib/current/slider/bin'
-  slider_conf_dir = "/usr/lib/slider/conf"
-  slider_bin_dir = "/usr/lib/slider/bin"
+  slider_bin_dir = '/usr/hdp/current/slider/bin'
 else:
-  slider_conf_dir = "/usr/lib/slider/conf"
   slider_bin_dir = "/usr/lib/slider/bin"
 
+slider_conf_dir = "/etc/slider/conf"
 hadoop_conf_dir = "/etc/hadoop/conf"
 smokeuser = config['configurations']['cluster-env']['smokeuser']
 security_enabled = config['configurations']['cluster-env']['security_enabled']
@@ -44,4 +41,4 @@ kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/
 
 java64_home = config['hostLevelParams']['java_home']
 log4j_props = config['configurations']['slider-log4j']['content']
-slider_cmd = format("{slider_bin_dir}/slider")
+slider_cmd = format("{slider_bin_dir}/slider")

+ 4 - 4
ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py

@@ -30,24 +30,24 @@ class TestSliderClient(RMFTestCase):
     )
 
     self.assertResourceCalled('Directory',
-                              '/usr/lib/slider/conf',
+                              '/etc/slider/conf',
                               recursive=True
     )
 
     self.assertResourceCalled('XmlConfig',
                               'slider-client.xml',
-                              conf_dir='/usr/lib/slider/conf',
+                              conf_dir='/etc/slider/conf',
                               configurations=self.getConfig()['configurations']['slider-client']
     )
 
     self.assertResourceCalled('File',
-                              '/usr/lib/slider/conf/slider-env.sh',
+                              '/etc/slider/conf/slider-env.sh',
                               content=Template('slider-env.sh.j2'),
                               mode=0755
     )
 
     self.assertResourceCalled('File',
-                              '/usr/lib/slider/conf/log4j.properties',
+                              '/etc/slider/conf/log4j.properties',
                               mode=0644,
                               content='log4jproperties\nline2'
     )