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 2017/04/20 16:09:55 UTC
ambari git commit: AMBARI-20799 - Ambari fails to upgrade from
2.4.2.0 to 2.5.1.0 during schema upgrade with NPE (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk f020edc85 -> f01284813
AMBARI-20799 - Ambari fails to upgrade from 2.4.2.0 to 2.5.1.0 during schema upgrade with NPE (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0128481
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0128481
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0128481
Branch: refs/heads/trunk
Commit: f012848130e6f3ae7c8121a781ec851885185327
Parents: f020edc
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Apr 20 08:58:15 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Apr 20 12:09:44 2017 -0400
----------------------------------------------------------------------
.../server/upgrade/AbstractUpgradeCatalog.java | 3 --
.../server/upgrade/UpgradeCatalog212.java | 3 --
.../server/upgrade/UpgradeCatalog251.java | 13 ++++++++
.../server/upgrade/UpgradeCatalog212Test.java | 34 +++-----------------
4 files changed, 18 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0128481/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 9a78ea1..6c59784 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -150,9 +150,6 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
registerCatalog(this);
}
- protected AbstractUpgradeCatalog() {
- }
-
/**
* Every subclass needs to register itself
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0128481/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index 20f0d72..90854dd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -87,9 +87,6 @@ public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
daoUtils = injector.getInstance(DaoUtils.class);
}
- protected UpgradeCatalog212() {
- }
-
// ----- UpgradeCatalog ----------------------------------------------------
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0128481/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
index a5f38a9..6f8f2a6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
@@ -22,6 +22,9 @@ import java.sql.SQLException;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+
/**
* The {@link UpgradeCatalog251} upgrades Ambari from 2.5.0 to 2.5.1.
*/
@@ -31,6 +34,16 @@ public class UpgradeCatalog251 extends AbstractUpgradeCatalog {
static final String HRC_IS_BACKGROUND_COLUMN = "is_background";
/**
+ * Constructor.
+ *
+ * @param injector
+ */
+ @Inject
+ public UpgradeCatalog251(Injector injector) {
+ super(injector);
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0128481/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
index 3743b53..896602b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -52,8 +52,6 @@ import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
-import org.apache.ambari.server.orm.dao.StackDAO;
-import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
@@ -69,6 +67,7 @@ import org.easymock.MockType;
import org.easymock.TestSubject;
import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -114,15 +113,11 @@ public class UpgradeCatalog212Test {
private ResultSet resultSet;
@TestSubject
- private UpgradeCatalog212 testSubject = new UpgradeCatalog212();
+ private UpgradeCatalog212 testSubject = new UpgradeCatalog212(
+ EasyMock.createNiceMock(Injector.class));
-
- private UpgradeCatalogHelper upgradeCatalogHelper;
- private StackEntity desiredStackEntity;
-
-
- // This method to be called only when an IOC is needed - typically by functional tests
- public void setupIoCContext() {
+ @Before
+ public void setUp() {
reset(entityManagerProvider);
expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes();
replay(entityManagerProvider);
@@ -130,12 +125,8 @@ public class UpgradeCatalog212Test {
injector = Guice.createInjector(new InMemoryDefaultTestModule());
injector.getInstance(GuiceJpaInitializer.class);
- upgradeCatalogHelper = injector.getInstance(UpgradeCatalogHelper.class);
// inject AmbariMetaInfo to ensure that stacks get populated in the DB
injector.getInstance(AmbariMetaInfo.class);
- // load the stack entity
- StackDAO stackDAO = injector.getInstance(StackDAO.class);
- desiredStackEntity = stackDAO.find("HDP", "2.2.0");
}
@After
@@ -148,7 +139,6 @@ public class UpgradeCatalog212Test {
@Test
public void testFinilizeTopologyDDL() throws Exception {
- setupIoCContext();
final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
dbAccessor.dropColumn(eq("topology_request"), eq("cluster_name"));
dbAccessor.setColumnNullable(eq("topology_request"), eq("cluster_id"), eq(false));
@@ -173,7 +163,6 @@ public class UpgradeCatalog212Test {
@Test
public void testExecuteDDLUpdates() throws Exception {
- setupIoCContext();
final DBAccessor dbAccessor = createNiceMock(DBAccessor.class);
Configuration configuration = createNiceMock(Configuration.class);
Connection connection = createNiceMock(Connection.class);
@@ -211,7 +200,6 @@ public class UpgradeCatalog212Test {
@Test
public void testExecuteDMLUpdates() throws Exception {
- setupIoCContext();
Method addMissingConfigs = UpgradeCatalog212.class.getDeclaredMethod("addMissingConfigs");
Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
@@ -235,7 +223,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHBaseAdnClusterConfigs() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
@@ -302,7 +289,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHBaseAdnClusterConfigsTrue() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
@@ -355,7 +341,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHBaseAdnClusterConfigsNoHBaseEnv() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
@@ -397,7 +382,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHBaseAdnClusterConfigsNoOverrideHBaseUID() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
@@ -415,9 +399,6 @@ public class UpgradeCatalog212Test {
expect(mockHbaseEnv.getProperties()).andReturn(propertiesHbaseEnv).once();
final Config mockClusterEnv = easyMockSupport.createNiceMock(Config.class);
- final Map<String, String> propertiesExpectedHbaseEnv = new HashMap<String, String>() {{
- put("hbase_user", "hbase");
- }};
final Map<String, String> propertiesExpectedClusterEnv = new HashMap<String, String>() {{
put("override_uid", "false");
}};
@@ -451,17 +432,14 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHiveConfigs() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
final Clusters mockClusters = easyMockSupport.createStrictMock(Clusters.class);
final Cluster mockClusterExpected = easyMockSupport.createNiceMock(Cluster.class);
- final Config mockHiveEnv = easyMockSupport.createNiceMock(Config.class);
final Config mockHiveSite = easyMockSupport.createNiceMock(Config.class);
- final Map<String, String> propertiesExpectedHiveEnv = new HashMap<>();
final Map<String, String> propertiesExpectedHiveSite = new HashMap<String, String>() {{
put("hive.heapsize", "512");
put("hive.server2.custom.authentication.class", "");
@@ -498,7 +476,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateOozieConfigs() throws Exception {
- setupIoCContext();
EasyMockSupport easyMockSupport = new EasyMockSupport();
final AmbariManagementController mockAmbariManagementController = easyMockSupport.createNiceMock(AmbariManagementController.class);
final ConfigHelper mockConfigHelper = easyMockSupport.createMock(ConfigHelper.class);
@@ -539,7 +516,6 @@ public class UpgradeCatalog212Test {
@Test
public void testUpdateHiveEnvContent() throws Exception {
- setupIoCContext();
final Injector mockInjector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {