You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/04 05:17:01 UTC
[18/50] [abbrv] git commit: Revert "AMBARI-7478. All Region Servers
are stopped after Decommission of Region Server (dlysnichenko)"
Revert "AMBARI-7478. All Region Servers are stopped after Decommission of Region Server (dlysnichenko)"
This reverts commit e9f2b4a8535036488e2dbca7445d72d725af6377.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a95d1e22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a95d1e22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a95d1e22
Branch: refs/heads/branch-alerts-dev
Commit: a95d1e220fd6dc19bd3a019b342ad1e2b1acc8c9
Parents: 0f7dcba
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Oct 2 11:16:44 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Oct 2 11:16:44 2014 -0700
----------------------------------------------------------------------
.../HBASE/package/scripts/hbase_decommission.py | 62 ++++++-------
.../services/HBASE/package/scripts/params.py | 2 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 6 +-
ambari-web/app/controllers/main/host/details.js | 91 +-------------------
4 files changed, 41 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a95d1e22/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py
index a623927..4f7ed9e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py
@@ -33,42 +33,42 @@ def hbase_decommission(env):
)
if params.hbase_excluded_hosts and params.hbase_excluded_hosts.split(","):
- hosts = params.hbase_excluded_hosts.split(",")
- elif params.hbase_included_hosts and params.hbase_included_hosts.split(","):
- hosts = params.hbase_included_hosts.split(",")
- if params.hbase_drain_only:
- for host in hosts:
- if host:
- regiondrainer_cmd = format(
- "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} remove {host}")
- Execute(regiondrainer_cmd,
- user=params.hbase_user,
- logoutput=True
- )
- pass
- pass
+ if params.hbase_drain_only == 'true':
+ hosts = params.hbase_excluded_hosts.split(",")
+ for host in hosts:
+ if host:
+ regiondrainer_cmd = format(
+ "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} remove {host}")
+ Execute(regiondrainer_cmd,
+ user=params.hbase_user,
+ logoutput=True
+ )
+ pass
+ pass
+
+ else:
- else:
- for host in hosts:
- if host:
- regiondrainer_cmd = format(
- "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} add {host}")
- regionmover_cmd = format(
- "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_mover} unload {host}")
+ hosts = params.hbase_excluded_hosts.split(",")
+ for host in hosts:
+ if host:
+ regiondrainer_cmd = format(
+ "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} add {host}")
+ regionmover_cmd = format(
+ "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_mover} unload {host}")
- Execute(regiondrainer_cmd,
- user=params.hbase_user,
- logoutput=True
- )
+ Execute(regiondrainer_cmd,
+ user=params.hbase_user,
+ logoutput=True
+ )
- Execute(regionmover_cmd,
- user=params.hbase_user,
- logoutput=True
- )
+ Execute(regionmover_cmd,
+ user=params.hbase_user,
+ logoutput=True
+ )
+ pass
pass
pass
- pass
-
+
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/a95d1e22/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index 1395ebb..04153bf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -46,7 +46,7 @@ else:
hadoop_conf_dir = "/etc/hadoop/conf"
hbase_conf_dir = "/etc/hbase/conf"
hbase_excluded_hosts = config['commandParams']['excluded_hosts']
-hbase_drain_only = default("/commandParams/mark_draining_only",False)
+hbase_drain_only = config['commandParams']['mark_draining_only']
hbase_included_hosts = config['commandParams']['included_hosts']
hbase_user = status_params.hbase_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/a95d1e22/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 856dd9a..a2261fb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -103,7 +103,11 @@ class TestHBaseMaster(RMFTestCase):
content = StaticFile('draining_servers.rb'),
mode = 0755,
)
- self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb remove host1',
+ self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add host1',
+ logoutput = True,
+ user = 'hbase',
+ )
+ self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main /usr/lib/hbase/bin/region_mover.rb unload host1',
logoutput = True,
user = 'hbase',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a95d1e22/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index 50c2a12..1f1bf8e 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -882,7 +882,7 @@ App.MainHostDetailsController = Em.Controller.extend({
this.doRecommissionAndRestart(hostName, svcName, "JOBTRACKER", "TASKTRACKER");
break;
case 'HBASE':
- this.doRecommissionAndStartRegionServer(hostName, svcName, "HBASE_MASTER", "HBASE_REGIONSERVER");
+ this.doRecommissionAndStart(hostName, svcName, "HBASE_MASTER", "HBASE_REGIONSERVER");
}
this.showBackgroundOperationsPopup();
},
@@ -971,7 +971,6 @@ App.MainHostDetailsController = Em.Controller.extend({
"RequestInfo": {
"context": Em.I18n.t('hosts.host.regionserver.decommission.batch1'),
"command": "DECOMMISSION",
- "exclusive" :"true",
"parameters": {
"slave_type": slaveType,
"excluded_hosts": hostNames
@@ -991,11 +990,10 @@ App.MainHostDetailsController = Em.Controller.extend({
{
"order_id": 2,
"type": "PUT",
- "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') +"/hosts/" + hostNames + "/host_components/" + slaveType,
+ "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') + "/host_components/" + slaveType,
"RequestBodyInfo": {
"RequestInfo": {
context: Em.I18n.t('hosts.host.regionserver.decommission.batch2'),
- exclusive:true,
operation_level: {
level: "HOST_COMPONENT",
cluster_name: App.get('clusterName'),
@@ -1020,11 +1018,10 @@ App.MainHostDetailsController = Em.Controller.extend({
"command": "DECOMMISSION",
"service_name": serviceName,
"component_name": componentName,
- "exclusive" :"true",
"parameters": {
"slave_type": slaveType,
"excluded_hosts": hostNames,
- "mark_draining_only": true
+ "mark_draining_only": "true"
},
'operation_level': {
level: "HOST_COMPONENT",
@@ -1071,7 +1068,7 @@ App.MainHostDetailsController = Em.Controller.extend({
return false;
}
},
-
+
/**
* Performs Recommission and Start
* @param {string} hostNames
@@ -1100,7 +1097,6 @@ App.MainHostDetailsController = Em.Controller.extend({
"RequestInfo": {
"context": context_1,
"command": "DECOMMISSION",
- "exclusive": true,
"parameters": {
"slave_type": slaveType,
"included_hosts": hostNames
@@ -1124,83 +1120,6 @@ App.MainHostDetailsController = Em.Controller.extend({
"RequestBodyInfo": {
"RequestInfo": {
context: startContext,
- exclusive:true,
- operation_level: {
- level: "HOST_COMPONENT",
- cluster_name: App.get('clusterName'),
- host_name: hostNames,
- service_name: serviceName || null
- }
- },
- "Body": {
- HostRoles: {
- state: "STARTED"
- }
- }
- }
- }
- ]
- },
- success: 'decommissionSuccessCallback',
- error: 'decommissionErrorCallback'
- });
- },
-
-
- /**
- * Performs Recommission and Start
- * @param {string} hostNames
- * @param {string} serviceName
- * @param {string} componentName
- * @param {string} slaveType
- * @method doRecommissionAndStart
- */
- doRecommissionAndStartRegionServer: function (hostNames, serviceName, componentName, slaveType) {
- var contextNameString_1 = 'hosts.host.' + slaveType.toLowerCase() + '.recommission';
- var context_1 = Em.I18n.t(contextNameString_1);
- var contextNameString_2 = 'requestInfo.startHostComponent.' + slaveType.toLowerCase();
- var startContext = Em.I18n.t(contextNameString_2);
- App.ajax.send({
- name: 'host.host_component.recommission_and_restart',
- sender: this,
- data: {
- intervalTimeSeconds: 1,
- tolerateSize: 1,
- batches: [
- {
- "order_id": 1,
- "type": "POST",
- "uri": App.apiPrefix + "/clusters/" + App.get('clusterName') + "/requests",
- "RequestBodyInfo": {
- "RequestInfo": {
- "context": context_1,
- "command": "DECOMMISSION",
- "exclusive":"true",
- "parameters": {
- "slave_type": slaveType,
- "mark_draining_only": true,
- "included_hosts": hostNames
- },
- 'operation_level': {
- level: "HOST_COMPONENT",
- cluster_name: App.get('clusterName'),
- host_name: hostNames,
- service_name: serviceName
- }
- },
- "Requests/resource_filters": [
- {"service_name": serviceName, "component_name": componentName}
- ]
- }
- },
- {
- "order_id": 2,
- "type": "PUT",
- "uri": App.get('apiPrefix') + "/clusters/" + App.get('clusterName') +"/hosts/" + hostNames + "/host_components/" + slaveType,
- "RequestBodyInfo": {
- "RequestInfo": {
- context: startContext,
- exclusive:true,
operation_level: {
level: "HOST_COMPONENT",
cluster_name: App.get('clusterName'),
@@ -1250,7 +1169,6 @@ App.MainHostDetailsController = Em.Controller.extend({
"RequestInfo": {
"context": context_1,
"command": "DECOMMISSION",
- "exclusive":"true",
"parameters": {
"slave_type": slaveType,
"included_hosts": hostNames
@@ -1277,7 +1195,6 @@ App.MainHostDetailsController = Em.Controller.extend({
"command": "RESTART",
"service_name": serviceName,
"component_name": slaveType,
- "exclusive":"true",
"hosts": hostNames
}
}