You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/07/27 11:18:56 UTC

ambari git commit: AMBARI-17903 Check HBase is failed after Upgrade from 2.1.2 to 2.4.0.0 (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk 22b0bd343 -> 751fbde7b


AMBARI-17903 Check HBase is failed after Upgrade from 2.1.2 to 2.4.0.0 (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/751fbde7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/751fbde7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/751fbde7

Branch: refs/heads/trunk
Commit: 751fbde7b9b8921a17d877d5ee8e8c8e0caf912b
Parents: 22b0bd3
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Jul 27 14:18:41 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Jul 27 14:18:41 2016 +0300

----------------------------------------------------------------------
 .../server/upgrade/UpgradeCatalog240.java       | 29 ++++++++
 .../ranger-hbase-plugin-properties.xml          |  6 ++
 .../stacks/HDP/2.2/services/stack_advisor.py    |  4 +-
 .../server/upgrade/UpgradeCatalog240Test.java   | 73 ++++++++++++++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/751fbde7/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 700b655..c58e8a3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -423,6 +423,7 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     updateRequestScheduleEntityUserIds();
     updateRecoveryConfigurationDML();
     updatePigSmokeTestEntityClass();
+    updateRangerHbasePluginProperties();
   }
 
   /**
@@ -2865,6 +2866,34 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
     }
   }
 
+  protected void updateRangerHbasePluginProperties() throws AmbariException {
+    AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
+    Clusters clusters = ambariManagementController.getClusters();
+
+    if (clusters != null) {
+      Map<String, Cluster> clusterMap = clusters.getClusters();
+
+      if (clusterMap != null && !clusterMap.isEmpty()) {
+        for (final Cluster cluster : clusterMap.values()) {
+          Set<String> installedServices = cluster.getServices().keySet();
+
+          if (installedServices.contains("HBASE") && installedServices.contains("RANGER")) {
+            Config rangerHbasePluginProperties = cluster.getDesiredConfigByType("ranger-hbase-plugin-properties");
+            Config clusterEnv = cluster.getDesiredConfigByType("cluster-env");
+
+            if (rangerHbasePluginProperties != null && clusterEnv != null) {
+              String smokeUserName = clusterEnv.getProperties().get("smokeuser");
+              String policyUser = rangerHbasePluginProperties.getProperties().get("policy_user");
+              if (policyUser != null && smokeUserName != null && !policyUser.equals(smokeUserName) && policyUser.equals("ambari-qa")) {
+                updateConfigurationProperties("ranger-hbase-plugin-properties", Collections.singletonMap("policy_user", smokeUserName), true, false);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
   /**
    * Update HBase Kerberos configurations. Ambari 2.4 will alter the HBase web UIs to
    * support SPNEGO authentication. HBase needs to have new keytab and principal properties

http://git-wip-us.apache.org/repos/asf/ambari/blob/751fbde7/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
index 62f9e83..adcf116 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
@@ -32,6 +32,12 @@
     <name>policy_user</name>
     <value>ambari-qa</value>
     <display-name>Policy user for HBASE</display-name>
+    <depends-on>
+      <property>
+        <type>ranger-env</type>
+        <name>ranger_user</name>
+      </property>
+    </depends-on>
     <description>This user must be system user and also present at Ranger admin portal</description>
     <on-ambari-upgrade add="true"/>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/751fbde7/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index ab41323..82f112b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -629,7 +629,9 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
       putHbaseRangerPluginProperty = self.putProperty(configurations, "ranger-hbase-plugin-properties", services)
       rangerEnvHbasePluginProperty = services["configurations"]["ranger-env"]["properties"]["ranger-hbase-plugin-enabled"]
       putHbaseRangerPluginProperty("ranger-hbase-plugin-enabled", rangerEnvHbasePluginProperty)
-
+      if "cluster-env" in services["configurations"] and "smokeuser" in services["configurations"]["cluster-env"]["properties"]:
+        smoke_user = services["configurations"]["cluster-env"]["properties"]["smokeuser"]
+        putHbaseRangerPluginProperty("policy_user", smoke_user)
     rangerPluginEnabled = ''
     if 'ranger-hbase-plugin-properties' in configurations and 'ranger-hbase-plugin-enabled' in  configurations['ranger-hbase-plugin-properties']['properties']:
       rangerPluginEnabled = configurations['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']

http://git-wip-us.apache.org/repos/asf/ambari/blob/751fbde7/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
index e57d582..a43ec9c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
@@ -586,6 +586,7 @@ public class UpgradeCatalog240Test {
     Method updateRequestScheduleEntityUserIds = UpgradeCatalog240.class.getDeclaredMethod("updateRequestScheduleEntityUserIds");
     Method updateRecoveryConfigurationDML = UpgradeCatalog240.class.getDeclaredMethod("updateRecoveryConfigurationDML");
     Method removeAtlasMetaserverAlert = UpgradeCatalog240.class.getDeclaredMethod("removeAtlasMetaserverAlert");
+    Method updateRangerHbasePluginProperties = UpgradeCatalog240.class.getDeclaredMethod("updateRangerHbasePluginProperties");
 
     Capture<String> capturedStatements = newCapture(CaptureType.ALL);
 
@@ -634,6 +635,7 @@ public class UpgradeCatalog240Test {
             .addMockedMethod(updateRequestScheduleEntityUserIds)
             .addMockedMethod(updateRecoveryConfigurationDML)
             .addMockedMethod(removeAtlasMetaserverAlert)
+            .addMockedMethod(updateRangerHbasePluginProperties)
             .createMock();
 
     Field field = AbstractUpgradeCatalog.class.getDeclaredField("dbAccessor");
@@ -674,6 +676,7 @@ public class UpgradeCatalog240Test {
     upgradeCatalog240.updateRequestScheduleEntityUserIds();
     upgradeCatalog240.updateRecoveryConfigurationDML();
     upgradeCatalog240.removeAtlasMetaserverAlert();
+    upgradeCatalog240.updateRangerHbasePluginProperties();
 
     replay(upgradeCatalog240, dbAccessor);
 
@@ -2368,6 +2371,76 @@ public class UpgradeCatalog240Test {
 
   }
 
+  /**
+   * Test that dfs.nameservices is copied over to dfs.internal.nameservices
+   * @throws Exception
+   */
+  @Test
+  public void testRangerHbasePluginProperertiesUpdateConfigs() throws Exception{
+    Map<String, String> oldRangerHbasePluginPropererties = new HashMap<String, String>() {
+      {
+        put("policy_user", "ambari-qa");
+      }
+    };
+    Map<String, String> newRangerHbasePluginPropererties = new HashMap<String, String>() {
+      {
+        put("policy_user", "cstm-user");
+      }
+    };
+    Map<String, String> hadoopEnvProperties = new HashMap<String, String>() {
+      {
+        put("smokeuser", "cstm-user");
+      }
+    };
+    EasyMockSupport easyMockSupport = new EasyMockSupport();
+
+    Clusters clusters = easyMockSupport.createNiceMock(Clusters.class);
+    final Cluster cluster = easyMockSupport.createNiceMock(Cluster.class);
+    final Service service = createStrictMock(Service.class);
+    final Map<String, Service> services = new HashMap<>();
+    services.put("HBASE", service);
+    services.put("RANGER", service);
+    Config mockRangerHbasePluginPropererties = easyMockSupport.createNiceMock(Config.class);
+    Config mockHadoopEnv = easyMockSupport.createNiceMock(Config.class);
+    expect(clusters.getClusters()).andReturn(new HashMap<String, Cluster>() {{
+      put("normal", cluster);
+    }}).anyTimes();
+    expect(cluster.getServices()).andReturn(services).once();
+    expect(cluster.getDesiredConfigByType("cluster-env")).andReturn(mockHadoopEnv).atLeastOnce();
+    expect(cluster.getDesiredConfigByType("ranger-hbase-plugin-properties")).andReturn(mockRangerHbasePluginPropererties).atLeastOnce();
+    expect(mockRangerHbasePluginPropererties.getProperties()).andReturn(oldRangerHbasePluginPropererties).anyTimes();
+    expect(mockHadoopEnv.getProperties()).andReturn(hadoopEnvProperties).anyTimes();
+
+
+    Injector injector = easyMockSupport.createNiceMock(Injector.class);
+    expect(injector.getInstance(Gson.class)).andReturn(null).anyTimes();
+    expect(injector.getInstance(MaintenanceStateHelper.class)).andReturn(null).anyTimes();
+    expect(injector.getInstance(KerberosHelper.class)).andReturn(createNiceMock(KerberosHelper.class)).anyTimes();
+
+    replay(injector, clusters, mockRangerHbasePluginPropererties, mockHadoopEnv, cluster);
+
+    AmbariManagementControllerImpl controller = createMockBuilder(AmbariManagementControllerImpl.class)
+            .addMockedMethod("createConfiguration")
+            .addMockedMethod("getClusters", new Class[]{})
+            .addMockedMethod("createConfig")
+            .withConstructor(createNiceMock(ActionManager.class), clusters, injector)
+            .createNiceMock();
+
+    Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
+    Capture<Map> propertiesCapture = EasyMock.newCapture();
+
+    expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
+    expect(controller.getClusters()).andReturn(clusters).anyTimes();
+    expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
+            anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+
+    replay(controller, injector2);
+    new UpgradeCatalog240(injector2).updateRangerHbasePluginProperties();
+    easyMockSupport.verifyAll();
+
+    Map<String, String> updatedProperties = propertiesCapture.getValue();
+    assertTrue(Maps.difference(newRangerHbasePluginPropererties, updatedProperties).areEqual());
+  }
 
 
   @Test