AMBARI-8560. Storm fails to start after adding service and restart attempts (aonishuk)

ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/service.py

@@ -32,7 +32,7 @@ def service(
   pid_file = status_params.pid_files[name]
   no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps -p `cat {pid_file}` >/dev/null 2>&1")
 
-  if name == "logviewer":
+  if name == "logviewer" or name == "drpc":
     tries_count = 12
   else:
     tries_count = 6

ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py

@@ -53,7 +53,7 @@ class TestStormDrpcServer(TestStormBase):
     self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l  | grep storm.daemon.drpc$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l  | grep storm.daemon.drpc$ | awk {'print $1'} > /var/run/storm/drpc.pid",
         logoutput = True,
         path = ['/usr/bin'],
-        tries = 6,
+        tries = 12,
         user = 'storm',
         try_sleep = 10,
     )
@@ -103,7 +103,7 @@ class TestStormDrpcServer(TestStormBase):
     self.assertResourceCalled('Execute', "/usr/jdk64/jdk1.7.0_45/bin/jps -l  | grep storm.daemon.drpc$ && /usr/jdk64/jdk1.7.0_45/bin/jps -l  | grep storm.daemon.drpc$ | awk {'print $1'} > /var/run/storm/drpc.pid",
         logoutput = True,
         path = ['/usr/bin'],
-        tries = 6,
+        tries = 12,
         user = 'storm',
         try_sleep = 10,
     )