http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py index 4cbce34..5017d39 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py @@ -48,9 +48,15 @@ upgrade_direction = default("/commandParams/upgrade_direction", None) stack_version_unformatted = str(config['hostLevelParams']['stack_version']) hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade +# New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade version = default("/commandParams/version", None) +# The desired role is only available during a Non-Rolling Upgrade in HA. +# The server calculates which of the two NameNodes will be the active, and the other the standby since they +# are started using different commands. +desired_namenode_role = default("/commandParams/desired_namenode_role", None) + + security_enabled = config['configurations']['cluster-env']['security_enabled'] hdfs_user = status_params.hdfs_user root_user = "root"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py index f5df86f..6a64b2f 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py @@ -19,7 +19,7 @@ limitations under the License. """ from resource_management.core.logger import Logger -def setup_ranger_hdfs(rolling_upgrade = False): +def setup_ranger_hdfs(upgrade_type=None): import params if params.has_ranger_admin: @@ -31,7 +31,7 @@ def setup_ranger_hdfs(rolling_upgrade = False): hdp_version = None - if rolling_upgrade: + if upgrade_type is not None: hdp_version = params.version setup_ranger_plugin('hadoop-client', 'hdfs', http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py index 108ef01..f67b1cb 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/snamenode.py @@ -38,13 +38,13 @@ class SNameNode(Script): hdfs("secondarynamenode") snamenode(action="configure") - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env) snamenode(action="start") - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) snamenode(action="stop") @@ -60,9 +60,7 @@ class SNameNodeDefault(SNameNode): def get_stack_to_component(self): return {"HDP": "hadoop-hdfs-secondarynamenode"} - def pre_rolling_restart(self, env): - # Secondary namenode is actually removed in an HA cluster, which is a pre-requisite for Rolling Upgrade, - # so it does not need any Rolling Restart logic. + def pre_upgrade_restart(self, env, upgrade_type=None): pass def security_status(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py index d1e764a..97ad424 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py @@ -32,6 +32,7 @@ from resource_management.core.logger import Logger from resource_management.libraries.functions.curl_krb_request import curl_krb_request from resource_management.core.exceptions import Fail from resource_management.libraries.functions.namenode_ha_utils import get_namenode_states +from resource_management.libraries.script.script import Script from zkfc_slave import ZkfcSlave @@ -336,3 +337,32 @@ def is_secure_port(port): return port < 1024 else: return False + +def is_previous_fs_image(): + """ + Return true if there's a previous folder in the HDFS namenode directories. + """ + import params + if params.dfs_name_dir: + nn_name_dirs = params.dfs_name_dir.split(',') + for nn_dir in nn_name_dirs: + prev_dir = os.path.join(nn_dir, "previous") + if os.path.isdir(prev_dir): + return True + return False + +def get_hdfs_binary(distro_component_name): + """ + Get the hdfs binary to use depending on the stack and version. + :param distro_component_name: e.g., hadoop-hdfs-namenode, hadoop-hdfs-datanode + :return: The hdfs binary to use + """ + import params + hdfs_binary = "hdfs" + if params.stack_name == "HDP": + # This was used in HDP 2.1 and earlier + hdfs_binary = "hdfs" + if Script.is_hdp_stack_greater_or_equal("2.2"): + hdfs_binary = "/usr/hdp/current/{0}/bin/hdfs".format(distro_component_name) + + return hdfs_binary \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py index 14de094..e9037d8 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py @@ -42,7 +42,7 @@ class ZkfcSlave(Script): @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ZkfcSlaveDefault(ZkfcSlave): - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) @@ -68,7 +68,7 @@ class ZkfcSlaveDefault(ZkfcSlave): create_log_dir=True ) - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py index f3b3d11..7644225 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py @@ -37,13 +37,13 @@ class ApplicationTimelineServer(Script): def install(self, env): self.install_packages(env) - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env) # FOR SECURITY service('timelineserver', action='start') - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) service('timelineserver', action='stop') @@ -65,8 +65,8 @@ class ApplicationTimelineServerDefault(ApplicationTimelineServer): def get_stack_to_component(self): return {"HDP": "hadoop-yarn-timelineserver"} - def pre_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade pre-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade pre-restart") import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py index 229dcd8..5d95c5c 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py @@ -44,7 +44,7 @@ class HistoryServer(Script): def install(self, env): self.install_packages(env) - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) service('historyserver', action='stop', serviceName='mapreduce') @@ -72,8 +72,8 @@ class HistoryServerDefault(HistoryServer): def get_stack_to_component(self): return {"HDP": "hadoop-mapreduce-historyserver"} - def pre_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade pre-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade pre-restart") import params env.set_params(params) @@ -86,7 +86,7 @@ class HistoryServerDefault(HistoryServer): copy_to_hdfs("slider", params.user_group, params.hdfs_user, host_sys_prepped=params.host_sys_prepped) params.HdfsResource(None, action="execute") - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env) # FOR SECURITY http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py index 5263d9f..7ceadf0 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapreduce2_client.py @@ -52,7 +52,7 @@ class MapReduce2ClientDefault(MapReduce2Client): def get_stack_to_component(self): return {"HDP": "hadoop-client"} - def pre_rolling_restart(self, env): + def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py index fd25651..d508d55 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/nodemanager.py @@ -39,12 +39,12 @@ class Nodemanager(Script): def install(self, env): self.install_packages(env) - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) service('nodemanager',action='stop') - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env) # FOR SECURITY @@ -67,8 +67,8 @@ class NodemanagerDefault(Nodemanager): def get_stack_to_component(self): return {"HDP": "hadoop-yarn-nodemanager"} - def pre_rolling_restart(self, env): - Logger.info("Executing NodeManager Rolling Upgrade pre-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing NodeManager Stack Upgrade pre-restart") import params env.set_params(params) @@ -76,8 +76,8 @@ class NodemanagerDefault(Nodemanager): conf_select.select(params.stack_name, "hadoop", params.version) hdp_select.select("hadoop-yarn-nodemanager", params.version) - def post_rolling_restart(self, env): - Logger.info("Executing NodeManager Rolling Upgrade post-restart") + def post_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing NodeManager Stack Upgrade post-restart") import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py index ba65fbc..929269d 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py @@ -57,7 +57,7 @@ stack_version_unformatted = str(config['hostLevelParams']['stack_version']) hdp_stack_version_major = format_hdp_stack_version(stack_version_unformatted) hdp_stack_version = functions.get_hdp_version('hadoop-yarn-resourcemanager') -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade. +# New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade. # It cannot be used during the initial Cluser Install because the version is not yet known. version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py index e67f1ce..ec7799e 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py @@ -47,7 +47,7 @@ class Resourcemanager(Script): def install(self, env): self.install_packages(env) - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) service('resourcemanager', action='stop') @@ -97,8 +97,8 @@ class ResourcemanagerDefault(Resourcemanager): def get_stack_to_component(self): return {"HDP": "hadoop-yarn-resourcemanager"} - def pre_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade post-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade post-restart") import params env.set_params(params) @@ -106,7 +106,7 @@ class ResourcemanagerDefault(Resourcemanager): conf_select.select(params.stack_name, "hadoop", params.version) hdp_select.select("hadoop-yarn-resourcemanager", params.version) - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py index e58ea3c..0c6115f 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn_client.py @@ -52,7 +52,7 @@ class YarnClientDefault(YarnClient): def get_stack_to_component(self): return {"HDP": "hadoop-client"} - def pre_rolling_restart(self, env): + def pre_upgrade_restart(self, env, upgrade_type=None): import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py index 973fa0f..ce5545f 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper.py @@ -28,13 +28,13 @@ from ambari_commons import OSConst from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT) -def zookeeper(type = None, rolling_restart = False): +def zookeeper(type = None, upgrade_type=None): import params if type == 'server': # This path may be missing after Ambari upgrade. We need to create it. We need to do this before any configs will # be applied. - if not rolling_restart and not os.path.exists("/usr/hdp/current/zookeeper-server") and params.current_version: + if upgrade_type is None and not os.path.exists("/usr/hdp/current/zookeeper-server") and params.current_version: conf_select.select(params.stack_name, "zookeeper", params.current_version) hdp_select.select("zookeeper-server", params.version) @@ -108,7 +108,7 @@ def zookeeper(type = None, rolling_restart = False): ) @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) -def zookeeper(type = None, rolling_restart = False): +def zookeeper(type = None, upgrade_type=None): import params configFile("zoo.cfg", template_name="zoo.cfg.j2", mode="f") configFile("configuration.xsl", template_name="configuration.xsl.j2", mode="f") http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_client.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_client.py index 02c1006..7a11fee 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_client.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_client.py @@ -37,13 +37,13 @@ class ZookeeperClient(Script): zookeeper(type='client') pass - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) self.configure(env) pass - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) pass @@ -60,8 +60,8 @@ class ZookeeperClientLinux(ZookeeperClient): self.install_packages(env) self.configure(env) - def pre_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade pre-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade pre-restart") import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_server.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_server.py index b7fb578..842deb0 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_server.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_server.py @@ -43,21 +43,21 @@ from ambari_commons.os_family_impl import OsFamilyImpl class ZookeeperServer(Script): - def configure(self, env, rolling_restart=False): + def configure(self, env, upgrade_type=None): import params env.set_params(params) - zookeeper(type='server', rolling_restart=rolling_restart) + zookeeper(type='server', upgrade_type=upgrade_type) - def start(self, env, rolling_restart=False): + def start(self, env, upgrade_type=None): import params env.set_params(params) - self.configure(env, rolling_restart=rolling_restart) - zookeeper_service(action='start', rolling_restart=rolling_restart) + self.configure(env, upgrade_type=upgrade_type) + zookeeper_service(action='start', upgrade_type=upgrade_type) - def stop(self, env, rolling_restart=False): + def stop(self, env, upgrade_type=None): import params env.set_params(params) - zookeeper_service(action='stop', rolling_restart=rolling_restart) + zookeeper_service(action='stop', upgrade_type=upgrade_type) @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT) class ZookeeperServerLinux(ZookeeperServer): @@ -69,8 +69,8 @@ class ZookeeperServerLinux(ZookeeperServer): self.install_packages(env) self.configure(env) - def pre_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade pre-restart") + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade pre-restart") import params env.set_params(params) @@ -78,8 +78,11 @@ class ZookeeperServerLinux(ZookeeperServer): conf_select.select(params.stack_name, "zookeeper", params.version) hdp_select.select("zookeeper-server", params.version) - def post_rolling_restart(self, env): - Logger.info("Executing Rolling Upgrade post-restart") + def post_upgrade_restart(self, env, upgrade_type=None): + if upgrade_type == "nonrolling": + return + + Logger.info("Executing Stack Upgrade post-restart") import params env.set_params(params) zk_server_host = random.choice(params.zookeeper_hosts) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_service.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_service.py index 685eb6d..14cd85c 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_service.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/zookeeper_service.py @@ -27,11 +27,11 @@ from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import hdp_select @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT) -def zookeeper_service(action='start', rolling_restart=False): +def zookeeper_service(action='start', upgrade_type=None): import params # This path may be missing after Ambari upgrade. We need to create it. - if not rolling_restart and not os.path.exists("/usr/hdp/current/zookeeper-server") and params.current_version: + if upgrade_type is None and not os.path.exists("/usr/hdp/current/zookeeper-server") and params.current_version: conf_select.select(params.stack_name, "zookeeper", params.current_version) hdp_select.select("zookeeper-server", params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml index daa1e08..c81b1ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml @@ -92,7 +92,7 @@ <skippable>true</skippable> <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Backup Oozie Database"> <task xsi:type="manual"> - <message>Before continuing, please backup the Oozie Server database on {{oozie-env/oozie_hostname}}.</message> + <message>Before continuing, please backup the Oozie Server database on {{hosts.all}}.</message> </task> </execute-stage> @@ -178,6 +178,16 @@ </execute-stage> </group> + <group xsi:type="cluster" name="Upgrade service configs" title="Upgrade service configs"> + <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> + <skippable>false</skippable> + + <!--YARN--> + <execute-stage service="MAPREDUCE2" component="HISTORYSERVER"> + <task xsi:type="configure" id="hdp_2_2_0_0_historyserver_classpath"/> + </execute-stage> + </group> + <!-- After processing this group, will change the effective Stack of the UpgradeContext object. --> <group xsi:type="update-stack" name="UPDATE_DESIRED_STACK_ID" title="Update Desired Stack Id"> <execute-stage title="Update Desired Stack Id" service="" component=""> @@ -221,6 +231,19 @@ </service> </group> + <group xsi:type="cluster" name="HDFS_LEAFE_SAFEMODE" title="HDFS - Wait to leave Safemode"> + <service-check>false</service-check> + <skippable>true</skippable> + <direction>UPGRADE</direction> + + <execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode"> + <task xsi:type="execute" hosts="master" summary="Wait for NameNode to leave Safemode"> + <script>scripts/namenode.py</script> + <function>wait_for_safemode_off</function> + </task> + </execute-stage> + </group> + <group xsi:type="restart" name="MR and YARN" title="MR and YARN"> <service-check>false</service-check> <skippable>true</skippable> @@ -266,10 +289,10 @@ <skippable>true</skippable> <direction>UPGRADE</direction> <priority> - <service>HBASE</service> - <service>MAPREDUCE2</service> - <service>YARN</service> <service>HDFS</service> + <service>YARN</service> + <service>MAPREDUCE2</service> + <service>HBASE</service> </priority> </group> http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml index 9c96dfb..7f8faf0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml @@ -19,6 +19,17 @@ <upgrade-config-changes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <services> + <service name="YARN"> + <component name="HISTORY_SERVER"> + <changes> + <definition xsi:type="configure" id="hdp_2_2_0_0_historyserver_classpath" summary="YARN Application Classpath"> + <type>yarn-site</type> + <set key="yarn.application.classpath" value="$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*"/> + </definition> + </changes> + </component> + </service> + <service name="HIVE"> <component name="HIVE_SERVER"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml index 8fbb963..5aacfa0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml @@ -271,6 +271,19 @@ </service> </group> + <group xsi:type="cluster" name="HDFS_LEAFE_SAFEMODE" title="HDFS - Wait to leave Safemode"> + <service-check>false</service-check> + <skippable>true</skippable> + <direction>UPGRADE</direction> + + <execute-stage service="HDFS" component="NAMENODE" title="Wait to leave Safemode"> + <task xsi:type="execute" hosts="master" summary="Wait for NameNode to leave Safemode"> + <script>scripts/namenode.py</script> + <function>wait_for_safemode_off</function> + </task> + </execute-stage> + </group> + <group xsi:type="restart" name="MR and YARN" title="MR and YARN"> <service-check>false</service-check> <skippable>true</skippable> http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java index bac00d4..94a5336 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java @@ -20,6 +20,7 @@ package org.apache.ambari.server.state.stack.upgrade; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; import org.apache.ambari.server.serveraction.upgrades.AutoSkipFailedSummaryAction; import org.apache.ambari.server.stack.HostsType; @@ -125,7 +126,7 @@ public class StageWrapperBuilderTest { */ @Override public void add(UpgradeContext upgradeContext, HostsType hostsType, String service, - boolean clientOnly, ProcessingComponent pc) { + boolean clientOnly, ProcessingComponent pc, Map<String, String> params) { } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py index fd66502..263eeb2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py @@ -450,7 +450,7 @@ class TestDatanode(RMFTestCase): ) - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -458,7 +458,7 @@ class TestDatanode(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -468,7 +468,7 @@ class TestDatanode(RMFTestCase): @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -478,7 +478,7 @@ class TestDatanode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -499,7 +499,7 @@ class TestDatanode(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart(self, time_mock): + def test_post_upgrade_restart(self, time_mock): shell_call_output = """ Live datanodes (2): @@ -523,7 +523,7 @@ class TestDatanode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file = "default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -537,12 +537,12 @@ class TestDatanode(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart_datanode_not_ready(self, time_mock): + def test_post_upgrade_restart_datanode_not_ready(self, time_mock): mocks_dict = {} try: self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file = "default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -556,12 +556,12 @@ class TestDatanode(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart_bad_returncode(self, time_mock): + def test_post_upgrade_restart_bad_returncode(self, time_mock): try: mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/datanode.py", classname = "DataNode", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file = "default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -594,7 +594,7 @@ class TestDatanode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = call_mock_side_effects, - command_args=[True]) + command_args=["rolling"]) raise Fail("Expected a fail since datanode didn't report a shutdown") except Exception, err: http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py index 9d93128..055f291 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_hdfs_client.py @@ -187,7 +187,7 @@ class Test(RMFTestCase): @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -197,7 +197,7 @@ class Test(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hdfs_client.py", classname = "HdfsClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -216,7 +216,7 @@ class Test(RMFTestCase): ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', '--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'), mocks_dict['call'].call_args_list[0][0][0]) - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -224,7 +224,7 @@ class Test(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hdfs_client.py", classname = "HdfsClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py index d333071..a6cd740 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py @@ -260,7 +260,7 @@ class TestJournalnode(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart(self, time_mock): + def test_post_upgrade_restart(self, time_mock): # load the NN and JN JMX files so that the urllib2.urlopen mock has data # to return num_journalnodes = 3 @@ -295,7 +295,7 @@ class TestJournalnode(RMFTestCase): with patch.object(urllib2, "urlopen", urlopen_mock): with patch.object(NamenodeHAState, "get_address", get_address_mock): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", - classname = "JournalNode", command = "post_rolling_restart", + classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade.json", checked_call_mocks = [(0, str(namenode_status_active)), (0, str(namenode_status_standby))], hdp_stack_version = self.UPGRADE_STACK_VERSION, @@ -314,7 +314,7 @@ class TestJournalnode(RMFTestCase): with patch.object(urllib2, "urlopen", urlopen_mock): with patch.object(NamenodeHAState, "get_address", get_address_mock): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", - classname = "JournalNode", command = "post_rolling_restart", + classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade-hdfs-secure.json", checked_call_mocks = [(0, str(namenode_status_active)), (0, str(namenode_status_standby))], hdp_stack_version = self.UPGRADE_STACK_VERSION, @@ -328,7 +328,7 @@ class TestJournalnode(RMFTestCase): @patch('time.sleep') @patch("urllib2.urlopen") - def test_post_rolling_restart_bad_jmx(self, urlopen_mock, time_mock): + def test_post_upgrade_restart_bad_jmx(self, urlopen_mock, time_mock): urlopen_mock_response = '{ "bad_data" : "gonna_mess_you_up" }' url_stream_mock = MagicMock() @@ -337,7 +337,7 @@ class TestJournalnode(RMFTestCase): try: self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", - classname = "JournalNode", command = "post_rolling_restart", + classname = "JournalNode", command = "post_upgrade_restart", config_file = "journalnode-upgrade.json", hdp_stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) @@ -460,7 +460,7 @@ class TestJournalnode(RMFTestCase): put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -468,7 +468,7 @@ class TestJournalnode(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", classname = "JournalNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -476,7 +476,7 @@ class TestJournalnode(RMFTestCase): self.assertNoMoreResources() @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -486,7 +486,7 @@ class TestJournalnode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/journalnode.py", classname = "JournalNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py index e954a84..afa404c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py @@ -1302,7 +1302,7 @@ class TestNamenode(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -1310,7 +1310,7 @@ class TestNamenode(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -1319,7 +1319,7 @@ class TestNamenode(RMFTestCase): self.assertNoMoreResources() @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -1329,7 +1329,7 @@ class TestNamenode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -1347,13 +1347,13 @@ class TestNamenode(RMFTestCase): ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', '--package', 'hadoop', '--stack-version', '2.3.0.0-1234', '--conf-version', '0'), mocks_dict['call'].call_args_list[0][0][0]) - def test_post_rolling_restart(self): + def test_post_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -1439,7 +1439,7 @@ class TestNamenode(RMFTestCase): self.assertNoMoreResources() @patch.object(shell, "call") - def test_pre_rolling_restart_21_and_lower_params(self, call_mock): + def test_pre_upgrade_restart_21_and_lower_params(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/nn_ru_lzo.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -1449,7 +1449,7 @@ class TestNamenode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -1462,7 +1462,7 @@ class TestNamenode(RMFTestCase): self.assertEquals("/usr/lib/hadoop/sbin", sys.modules["params"].hadoop_bin) @patch.object(shell, "call") - def test_pre_rolling_restart_22_params(self, call_mock): + def test_pre_upgrade_restart_22_params(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/nn_ru_lzo.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -1474,7 +1474,7 @@ class TestNamenode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -1487,7 +1487,7 @@ class TestNamenode(RMFTestCase): self.assertEquals("/usr/hdp/current/hadoop-client/sbin", sys.modules["params"].hadoop_bin) @patch.object(shell, "call") - def test_pre_rolling_restart_23_params(self, call_mock): + def test_pre_upgrade_restart_23_params(self, call_mock): import itertools config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/nn_ru_lzo.json" @@ -1502,7 +1502,7 @@ class TestNamenode(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py", classname = "NameNode", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py index ee85e4a..5852eaf 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py @@ -384,7 +384,7 @@ class TestNFSGateway(RMFTestCase): self.assertNoMoreResources() @patch("resource_management.core.shell.call") - def test_pre_rolling_restart(self, call_mock): + def test_pre_upgrade_restart(self, call_mock): call_mock.side_effects = [(0, None), (0, None)] config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: @@ -395,7 +395,7 @@ class TestNFSGateway(RMFTestCase): json_content['hostLevelParams']['stack_version'] = stack_version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nfsgateway.py", classname = "NFSGateway", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 1321aaa..40a085f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -767,7 +767,7 @@ class TestHistoryServer(RMFTestCase): @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value="2.3.0")) @patch.object(functions, "get_hdp_version", new = MagicMock(return_value="2.3.0.0-1234")) @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") - def test_pre_rolling_restart_23(self, copy_to_hdfs_mock): + def test_pre_upgrade_restart_23(self, copy_to_hdfs_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -778,7 +778,7 @@ class TestHistoryServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/historyserver.py", classname = "HistoryServer", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index 532ce36..dd20b79 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py @@ -387,7 +387,7 @@ class TestMapReduce2Client(RMFTestCase): self.assertResourceCalled("Execute", ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'hadoop-client', '2.2.1.0-2067'), sudo=True) - def test_pre_rolling_restart_23(self): + def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/client-upgrade.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -397,7 +397,7 @@ class TestMapReduce2Client(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mapreduce2_client.py", classname = "MapReduce2Client", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py index e7da747..3ccde3b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py @@ -520,7 +520,7 @@ class TestNodeManager(RMFTestCase): @patch('time.sleep') @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) - def test_post_rolling_restart(self, time_mock): + def test_post_upgrade_restart(self, time_mock): process_output = """ c6401.ambari.apache.org:45454 RUNNING c6401.ambari.apache.org:8042 0 """ @@ -528,7 +528,7 @@ class TestNodeManager(RMFTestCase): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nodemanager.py", classname = "Nodemanager", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file = "default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -547,7 +547,7 @@ class TestNodeManager(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart_nodemanager_not_ready(self, time_mock): + def test_post_upgrade_restart_nodemanager_not_ready(self, time_mock): process_output = """ c9999.ambari.apache.org:45454 RUNNING c9999.ambari.apache.org:8042 0 """ @@ -556,7 +556,7 @@ class TestNodeManager(RMFTestCase): try: self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nodemanager.py", classname="Nodemanager", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file="default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -570,7 +570,7 @@ class TestNodeManager(RMFTestCase): @patch('time.sleep') - def test_post_rolling_restart_nodemanager_not_ready(self, time_mock): + def test_post_upgrade_restart_nodemanager_not_ready(self, time_mock): process_output = """ c6401.ambari.apache.org:45454 RUNNING c6401.ambari.apache.org:8042 0 """ @@ -579,7 +579,7 @@ class TestNodeManager(RMFTestCase): try: self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nodemanager.py", classname="Nodemanager", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_file="default.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -701,7 +701,7 @@ class TestNodeManager(RMFTestCase): @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) - def test_pre_rolling_restart_23(self): + def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -711,7 +711,7 @@ class TestNodeManager(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nodemanager.py", classname = "Nodemanager", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index a965c90..4639bd4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -623,7 +623,7 @@ class TestResourceManager(RMFTestCase): ) put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) - def test_pre_rolling_restart_23(self): + def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -633,7 +633,7 @@ class TestResourceManager(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/resourcemanager.py", classname = "Resourcemanager", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py index 413b2ad..78043f6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py @@ -556,7 +556,7 @@ class TestYarnClient(RMFTestCase): # for now, it's enough that hdp-select is confirmed @patch.object(functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) - def test_pre_rolling_restart_23(self): + def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -566,7 +566,7 @@ class TestYarnClient(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/yarn_client.py", classname = "YarnClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py index 7a624bd..7a6d225 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py @@ -154,7 +154,7 @@ class TestZookeeperClient(RMFTestCase): self.assertNoMoreResources() - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -162,7 +162,7 @@ class TestZookeeperClient(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/zookeeper_client.py", classname = "ZookeeperClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -171,7 +171,7 @@ class TestZookeeperClient(RMFTestCase): self.assertNoMoreResources() @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): call_mock.side_effects = [(0, None), (0, None)] config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" @@ -183,7 +183,7 @@ class TestZookeeperClient(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/zookeeper_client.py", classname = "ZookeeperClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py index a6d610f..8949eaa 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py @@ -340,7 +340,7 @@ class TestZookeeperServer(RMFTestCase): put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -348,7 +348,7 @@ class TestZookeeperServer(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/zookeeper_server.py", classname = "ZookeeperServer", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -357,7 +357,7 @@ class TestZookeeperServer(RMFTestCase): self.assertNoMoreResources() @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): call_mock.side_effects = [(0, None), (0, None)] config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" @@ -369,7 +369,7 @@ class TestZookeeperServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/zookeeper_server.py", classname = "ZookeeperServer", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, @@ -391,7 +391,7 @@ class TestZookeeperServer(RMFTestCase): self.assertNoMoreResources() @patch.object(resource_management.libraries.functions, "get_unique_id_and_date") - def test_post_rolling_restart(self, get_unique_id_and_date_mock): + def test_post_upgrade_restart(self, get_unique_id_and_date_mock): unique_value = "unique1" get_unique_id_and_date_mock.return_value = unique_value config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" @@ -403,7 +403,7 @@ class TestZookeeperServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/zookeeper_server.py", classname = "ZookeeperServer", - command = "post_rolling_restart", + command = "post_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe5a4e/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index 6f3ea6d..0e467d8 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -375,7 +375,7 @@ class TestAppTimelineServer(RMFTestCase): put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @patch.object(resource_management.libraries.functions, "get_hdp_version", new = MagicMock(return_value='2.3.0.0-1234')) - def test_pre_rolling_restart_23(self): + def test_pre_upgrade_restart_23(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -385,7 +385,7 @@ class TestAppTimelineServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py", classname = "ApplicationTimelineServer", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES,