Repository: ambari Updated Branches: refs/heads/trunk f7a1d4e7e -> f2bbe4781
http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java index c1056dd..75ad9ab 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java @@ -193,7 +193,7 @@ public class TestActionDBAccessorImpl { List<Stage> stages = new ArrayList<>(); stages.add(createStubStage(hostName, requestId, stageId)); stages.add(createStubStage(hostName, requestId, stageId + 1)); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); db.persistActions(request); assertEquals(2, stages.size()); } @@ -539,7 +539,7 @@ public class TestActionDBAccessorImpl { @Test public void testAbortRequest() throws AmbariException { Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action db accessor test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); clusters.addHost("host2"); @@ -576,7 +576,8 @@ public class TestActionDBAccessorImpl { String hostName = cmd.getHostName(); cmd.setStatus(HostRoleStatus.COMPLETED); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); + request.setClusterHostInfo("clusterHostInfo"); db.persistActions(request); db.abortOperation(requestId); @@ -620,7 +621,7 @@ public class TestActionDBAccessorImpl { stages.add(stage); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); // persist entities db.persistActions(request); @@ -668,7 +669,7 @@ public class TestActionDBAccessorImpl { @Test public void testGet1000TasksFromOracleDB() throws Exception { Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action db accessor test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); for (int i = 1000; i < 2002; i++) { String host = "host" + i; @@ -681,7 +682,8 @@ public class TestActionDBAccessorImpl { List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); + request.setClusterHostInfo("clusterHostInfo"); db.persistActions(request); List<HostRoleCommandEntity> entities = @@ -709,7 +711,7 @@ public class TestActionDBAccessorImpl { Stage s = createStubStage(hostname, requestId, stageId); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); db.persistActions(request); } @@ -723,7 +725,7 @@ public class TestActionDBAccessorImpl { stages.add(stage); } - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); db.persistActions(request); } @@ -733,7 +735,7 @@ public class TestActionDBAccessorImpl { Stage s = createStubStage(hostname, requestId, stageId); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); s.setHostRoleStatus(hostname, Role.HBASE_REGIONSERVER.name(), HostRoleStatus.COMPLETED); s.setHostRoleStatus(hostname, Role.HBASE_MASTER.name(), HostRoleStatus.COMPLETED); @@ -747,7 +749,7 @@ public class TestActionDBAccessorImpl { List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); s.setHostRoleStatus(hostname, Role.HBASE_REGIONSERVER.name(), HostRoleStatus.PENDING); s.setHostRoleStatus(hostname, Role.HBASE_MASTER.name(), HostRoleStatus.COMPLETED); @@ -756,7 +758,7 @@ public class TestActionDBAccessorImpl { private Stage createStubStage(String hostname, long requestId, long stageId) { Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action db accessor test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(hostname, Role.HBASE_MASTER, RoleCommand.START, @@ -774,7 +776,7 @@ public class TestActionDBAccessorImpl { private void populateActionDBWithCustomAction(ActionDBAccessor db, String hostname, long requestId, long stageId) throws AmbariException { Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action db accessor test", - "", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(hostname, Role.valueOf(actionName), RoleCommand.ACTIONEXECUTE, @@ -785,20 +787,22 @@ public class TestActionDBAccessorImpl { final RequestResourceFilter resourceFilter = new RequestResourceFilter("HBASE", "HBASE_MASTER", null); List<RequestResourceFilter> resourceFilters = new ArrayList<RequestResourceFilter>() {{ add(resourceFilter); }}; - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); + request.setClusterHostInfo(""); db.persistActions(request); } private void populateActionDBWithServerAction(ActionDBAccessor db, String hostname, long requestId, long stageId) throws AmbariException { Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action db accessor test", - "", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addServerActionCommand(serverActionName, null, Role.AMBARI_SERVER_ACTION, RoleCommand.ACTIONEXECUTE, clusterName, null, null, "command details", null, 300, false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); + request.setClusterHostInfo(""); db.persistActions(request); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java index fbd7c4e..410de80 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java @@ -220,7 +220,7 @@ public class TestActionManager { } private void populateActionDB(ActionDBAccessor db, String hostname) throws AmbariException { - Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(hostname, Role.HBASE_MASTER, RoleCommand.START, @@ -228,12 +228,12 @@ public class TestActionManager { hostname, System.currentTimeMillis()), "cluster1", "HBASE", false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "clusterHostInfo", clusters); db.persistActions(request); } private void populateActionDBWithTwoCommands(ActionDBAccessor db, String hostname) throws AmbariException { - Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(hostname, Role.HBASE_MASTER, RoleCommand.START, @@ -245,7 +245,7 @@ public class TestActionManager { hostname, System.currentTimeMillis()), "cluster1", "HBASE", false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "clusterHostInfo", clusters); db.persistActions(request); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java index b1a7524..869234b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java @@ -210,7 +210,7 @@ public class TestActionScheduler { ActionDBAccessor db = mock(ActionDBAccessorImpl.class); HostRoleCommandDAO hostRoleCommandDAOMock = mock(HostRoleCommandDAO.class); Mockito.doNothing().when(hostRoleCommandDAOMock).publishTaskCreateEvent(anyListOf(HostRoleCommand.class)); - Stage s = StageUtils.getATestStage(1, 977, hostname, CLUSTER_HOST_INFO, + Stage s = StageUtils.getATestStage(1, 977, hostname, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); List<Stage> stages = Collections.singletonList(s); @@ -219,8 +219,10 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); + //Keep large number of attempts so that the task is not expired finally //Small action timeout to test rescheduling ActionScheduler scheduler = new ActionScheduler(100, 5, db, aq, fsm, @@ -306,7 +308,7 @@ public class TestActionScheduler { hostEntity.setHostName(hostname); hostDAO.create(hostEntity); - final Stage s = StageUtils.getATestStage(1, 977, hostname, CLUSTER_HOST_INFO, + final Stage s = StageUtils.getATestStage(1, 977, hostname, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); s.addHostRoleExecutionCommand(hostname, Role.SECONDARY_NAMENODE, RoleCommand.INSTALL, new ServiceComponentHostInstallEvent("SECONDARY_NAMENODE", hostname, System.currentTimeMillis(), "HDP-1.2.0"), @@ -322,6 +324,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); doAnswer(new Answer<Void>() { @@ -395,7 +398,7 @@ public class TestActionScheduler { when(host.getState()).thenReturn(HostState.HEARTBEAT_LOST); when(host.getHostName()).thenReturn(hostname); - final Stage s = StageUtils.getATestStage(1, 977, hostname, CLUSTER_HOST_INFO, + final Stage s = StageUtils.getATestStage(1, 977, hostname, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); List<Stage> stages = Collections.singletonList(s); @@ -483,7 +486,7 @@ public class TestActionScheduler { when(serviceObj.getCluster()).thenReturn(oneClusterMock); final Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L, "stageWith2Tasks", - CLUSTER_HOST_INFO, "{\"command_param\":\"param_value\"}", "{\"host_param\":\"param_value\"}"); + "{\"command_param\":\"param_value\"}", "{\"host_param\":\"param_value\"}"); addInstallTaskToStage(stage, hostname1, "cluster1", Role.DATANODE, RoleCommand.INSTALL, Service.Type.HDFS, 1); addInstallTaskToStage(stage, hostname2, "cluster1", Role.NAMENODE, @@ -613,6 +616,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -730,6 +734,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -773,6 +778,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -987,6 +993,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -1053,7 +1060,7 @@ public class TestActionScheduler { String requestContext, int timeout, boolean stageSupportsAutoSkip, boolean autoSkipFailedTask) { - Stage stage = stageFactory.createNew(requestId, "/tmp", "cluster1", 1L, requestContext, CLUSTER_HOST_INFO, + Stage stage = stageFactory.createNew(requestId, "/tmp", "cluster1", 1L, requestContext, "{}", "{}"); stage.setStageId(stageId); @@ -1141,6 +1148,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(firstStageInProgressPerRequest.size()); @@ -1232,6 +1240,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -1309,6 +1318,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -1374,6 +1384,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stages.size()); @@ -1520,7 +1531,7 @@ public class TestActionScheduler { long now = System.currentTimeMillis(); Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L, - "testRequestFailureBasedOnSuccessFactor", CLUSTER_HOST_INFO, "", ""); + "testRequestFailureBasedOnSuccessFactor", "", ""); stage.setStageId(1); addHostRoleExecutionCommand(now, stage, Role.SQOOP, Service.Type.SQOOP, @@ -1720,7 +1731,7 @@ public class TestActionScheduler { long now = System.currentTimeMillis(); Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L, "testRequestFailureBasedOnSuccessFactor", - CLUSTER_HOST_INFO, "", ""); + "", ""); stage.setStageId(1); stage.addHostRoleExecutionCommand("host1", Role.DATANODE, RoleCommand.UPGRADE, new ServiceComponentHostUpgradeEvent(Role.DATANODE.toString(), "host1", now, "HDP-0.2"), @@ -1871,7 +1882,7 @@ public class TestActionScheduler { private Stage createStage(String clusterName, int stageId, int requestId) { Stage stage = stageFactory.createNew(requestId, "/tmp", clusterName, 1L, "getStageWithSingleTask", - CLUSTER_HOST_INFO, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); + "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); stage.setStageId(stageId); return stage; } @@ -1971,7 +1982,6 @@ public class TestActionScheduler { //Data for stages Map<String, Set<String>> clusterHostInfo1 = StageUtils.getGson().fromJson(CLUSTER_HOST_INFO, type); - Map<String, Set<String>> clusterHostInfo2 = StageUtils.getGson().fromJson(CLUSTER_HOST_INFO_UPDATED, type); int stageId = 1; int requestId1 = 1; int requestId2 = 2; @@ -2006,11 +2016,12 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); - Stage s1 = StageUtils.getATestStage(requestId1, stageId, hostname, CLUSTER_HOST_INFO, + Stage s1 = StageUtils.getATestStage(requestId1, stageId, hostname, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); - Stage s2 = StageUtils.getATestStage(requestId2, stageId, hostname, CLUSTER_HOST_INFO_UPDATED, + Stage s2 = StageUtils.getATestStage(requestId2, stageId, hostname, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); when(db.getCommandsInProgressCount()).thenReturn(1); @@ -2037,7 +2048,7 @@ public class TestActionScheduler { ac = waitForQueueSize(hostname, aq, 1, scheduler); assertTrue(ac.get(0) instanceof ExecutionCommand); assertEquals(String.valueOf(requestId2) + "-" + stageId, ((ExecutionCommand) (ac.get(0))).getCommandId()); - assertEquals(clusterHostInfo2, ((ExecutionCommand) (ac.get(0))).getClusterHostInfo()); + assertEquals(clusterHostInfo1, ((ExecutionCommand) (ac.get(0))).getClusterHostInfo()); } @@ -2087,7 +2098,7 @@ public class TestActionScheduler { when(serviceObj.getCluster()).thenReturn(oneClusterMock); Stage stage1 = stageFactory.createNew(1, "/tmp", "cluster1", 1L, "stageWith2Tasks", - CLUSTER_HOST_INFO, "", ""); + "", ""); addInstallTaskToStage(stage1, hostname1, "cluster1", Role.HBASE_MASTER, RoleCommand.INSTALL, Service.Type.HBASE, 1); addInstallTaskToStage(stage1, hostname1, "cluster1", Role.HBASE_REGIONSERVER, @@ -2166,6 +2177,7 @@ public class TestActionScheduler { Mockito.doNothing().when(hostRoleCommandDAOMock).publishTaskCreateEvent(anyListOf(HostRoleCommand.class)); RequestEntity request = mock(RequestEntity.class); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(request.isExclusive()).thenReturn(false); when(db.getRequestEntity(anyLong())).thenReturn(request); @@ -2319,6 +2331,7 @@ public class TestActionScheduler { RequestEntity request = mock(RequestEntity.class); when(request.isExclusive()).thenReturn(false); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(anyLong())).thenReturn(request); when(db.getCommandsInProgressCount()).thenReturn(stagesInProgress.size()); @@ -2569,10 +2582,13 @@ public class TestActionScheduler { RequestEntity request1 = mock(RequestEntity.class); when(request1.isExclusive()).thenReturn(false); + when(request1.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); RequestEntity request2 = mock(RequestEntity.class); when(request2.isExclusive()).thenReturn(true); + when(request2.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); RequestEntity request3 = mock(RequestEntity.class); when(request3.isExclusive()).thenReturn(false); + when(request3.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(db.getRequestEntity(requestId1)).thenReturn(request1); when(db.getRequestEntity(requestId2)).thenReturn(request2); @@ -2764,6 +2780,7 @@ public class TestActionScheduler { Mockito.doNothing().when(hostRoleCommandDAOMock).publishTaskCreateEvent(anyListOf(HostRoleCommand.class)); RequestEntity request = mock(RequestEntity.class); + when(request.getClusterHostInfo()).thenReturn(CLUSTER_HOST_INFO); when(request.isExclusive()).thenReturn(false); when(db.getRequestEntity(anyLong())).thenReturn(request); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java index b76e41e..82db6e1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java @@ -60,7 +60,7 @@ public class TestStage { @Test public void testTaskTimeout() { - Stage s = StageUtils.getATestStage(1, 1, "h1", CLUSTER_HOST_INFO, "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); + Stage s = StageUtils.getATestStage(1, 1, "h1", "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); s.addHostRoleExecutionCommand("h1", Role.DATANODE, RoleCommand.INSTALL, null, "c1", "HDFS", false, false); s.addHostRoleExecutionCommand("h1", Role.HBASE_MASTER, RoleCommand.INSTALL, @@ -75,9 +75,8 @@ public class TestStage { @Test public void testGetRequestContext() { - Stage stage = stageFactory.createNew(1, "/logDir", "c1", 1L, "My Context", CLUSTER_HOST_INFO, "", ""); + Stage stage = stageFactory.createNew(1, "/logDir", "c1", 1L, "My Context", "", ""); assertEquals("My Context", stage.getRequestContext()); - assertEquals(CLUSTER_HOST_INFO, stage.getClusterHostInfo()); } @After http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java index 2dd91c0..ceda927 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java @@ -987,7 +987,7 @@ public class HeartbeatProcessorTest { serviceComponentHost2.setStackVersion(stack120); Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(DummyHostname1, Role.DATANODE, RoleCommand.UPGRADE, new ServiceComponentHostUpgradeEvent(Role.DATANODE.toString(), @@ -999,7 +999,7 @@ public class HeartbeatProcessorTest { DummyCluster, "HDFS", false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "clusterHostInfo", clusters); actionDBAccessor.persistActions(request); CommandReport cr = new CommandReport(); cr.setActionId(StageUtils.getActionId(requestId, stageId)); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java index 2e65e8d..a13053c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java @@ -223,7 +223,7 @@ public class HeartbeatTestHelper { public void populateActionDB(ActionDBAccessor db, String DummyHostname1, long requestId, long stageId) throws AmbariException { Stage s = stageFactory.createNew(requestId, "/a/b", DummyCluster, 1L, "heartbeat handler test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); String filename = null; s.addHostRoleExecutionCommand(DummyHostname1, Role.HBASE_MASTER, @@ -232,7 +232,7 @@ public class HeartbeatTestHelper { DummyHostname1, System.currentTimeMillis()), DummyCluster, HBASE, false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "clusterHostInfo", clusters); db.persistActions(request); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java index 909bf69..5ced924 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java @@ -864,7 +864,7 @@ public class TestHeartbeatHandler { serviceComponentHost1.setState(State.INSTALLING); Stage s = stageFactory.createNew(1, "/a/b", "cluster1", 1L, "action manager test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(1); s.addHostRoleExecutionCommand(DummyHostname1, Role.DATANODE, RoleCommand.INSTALL, new ServiceComponentHostInstallEvent(Role.DATANODE.toString(), @@ -872,7 +872,7 @@ public class TestHeartbeatHandler { DummyCluster, "HDFS", false, false); List<Stage> stages = new ArrayList<>(); stages.add(s); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "clusterHostInfo", clusters); actionDBAccessor.persistActions(request); actionDBAccessor.abortHostRole(DummyHostname1, 1, 1, Role.DATANODE.name()); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index 628a56f..cbd5de3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -8272,7 +8272,7 @@ public class AmbariManagementControllerTest { List<Stage> stages = new ArrayList<>(); stages.add(stageFactory.createNew(requestId1, "/a1", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(0).setStageId(1); stages.get(0).addHostRoleExecutionCommand(hostName1, Role.HBASE_MASTER, RoleCommand.START, @@ -8281,7 +8281,7 @@ public class AmbariManagementControllerTest { cluster1, "HBASE", false, false); stages.add(stageFactory.createNew(requestId1, "/a2", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(1).setStageId(2); stages.get(1).addHostRoleExecutionCommand(hostName1, Role.HBASE_CLIENT, RoleCommand.START, @@ -8289,19 +8289,19 @@ public class AmbariManagementControllerTest { hostName1, System.currentTimeMillis()), cluster1, "HBASE", false, false); stages.add(stageFactory.createNew(requestId1, "/a3", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(2).setStageId(3); stages.get(2).addHostRoleExecutionCommand(hostName1, Role.HBASE_CLIENT, RoleCommand.START, new ServiceComponentHostStartEvent(Role.HBASE_CLIENT.toString(), hostName1, System.currentTimeMillis()), cluster1, "HBASE", false, false); - Request request = new Request(stages, clusters); + Request request = new Request(stages, "", clusters); actionDB.persistActions(request); stages.clear(); stages.add(stageFactory.createNew(requestId2, "/a4", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(0).setStageId(4); stages.get(0).addHostRoleExecutionCommand(hostName1, Role.HBASE_CLIENT, RoleCommand.START, @@ -8309,14 +8309,14 @@ public class AmbariManagementControllerTest { hostName1, System.currentTimeMillis()), cluster1, "HBASE", false, false); stages.add(stageFactory.createNew(requestId2, "/a5", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(1).setStageId(5); stages.get(1).addHostRoleExecutionCommand(hostName1, Role.HBASE_CLIENT, RoleCommand.START, new ServiceComponentHostStartEvent(Role.HBASE_CLIENT.toString(), hostName1, System.currentTimeMillis()), cluster1, "HBASE", false, false); - request = new Request(stages, clusters); + request = new Request(stages, "", clusters); actionDB.persistActions(request); // Add a stage to execute a task as server-side action on the Ambari server @@ -8324,12 +8324,12 @@ public class AmbariManagementControllerTest { new ServiceComponentHostServerActionEvent(Role.AMBARI_SERVER_ACTION.toString(), null, System.currentTimeMillis()); stages.clear(); stages.add(stageFactory.createNew(requestId3, "/a6", cluster1, clusterId, context, - CLUSTER_HOST_INFO, "", "")); + "", "")); stages.get(0).setStageId(6); stages.get(0).addServerActionCommand("some.action.class.name", null, Role.AMBARI_SERVER_ACTION, RoleCommand.EXECUTE, cluster1, serviceComponentHostServerActionEvent, null, null, null, null, false, false); assertEquals("_internal_ambari", stages.get(0).getOrderedHostRoleCommands().get(0).getHostName()); - request = new Request(stages, clusters); + request = new Request(stages, "", clusters); actionDB.persistActions(request); org.apache.ambari.server.controller.spi.Request spiRequest = PropertyHelper.getReadRequest( http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java index 5275580..e654c72 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java @@ -1103,6 +1103,8 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); @@ -1110,28 +1112,38 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); } // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // TODO: Add more of these when more stages are added. // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); @@ -1294,36 +1306,50 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); if (identitiesManaged) { // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); } // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); // TODO: Add more of these when more stages are added. // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); - requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); + + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + + requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); replayAll(); @@ -1479,42 +1505,58 @@ public class KerberosHelperTest extends EasyMockSupport { // Hook Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); // StopZk Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(anyObject(List.class)); expectLastCall().once(); // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Update Configs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Destroy Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Cleanup Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); @@ -1687,31 +1729,43 @@ public class KerberosHelperTest extends EasyMockSupport { // Create Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Update Configurations Stage expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); } else { @@ -2809,7 +2863,7 @@ public class KerberosHelperTest extends EasyMockSupport { private void setupStageFactory() { final StageFactory stageFactory = injector.getInstance(StageFactory.class); expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), - anyLong(), anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyLong(), anyObject(String.class), anyObject(String.class), anyObject(String.class))) .andAnswer(new IAnswer<Stage>() { @Override @@ -3061,26 +3115,36 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); @@ -3253,21 +3317,29 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Delete Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); @@ -3420,26 +3492,37 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); + requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Create Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Distribute Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); } @@ -3582,21 +3665,29 @@ public class KerberosHelperTest extends EasyMockSupport { // Preparation Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Delete Principals Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Delete Keytabs Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); // Clean-up/Finalize Stage expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes(); expect(requestStageContainer.getId()).andReturn(1L).once(); + requestStageContainer.setClusterHostInfo(anyString()); + expectLastCall().once(); requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject()); expectLastCall().once(); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java index c399a4c..a0ec67f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java @@ -743,7 +743,7 @@ public class CalculatedStatusTest { private final List<HostRoleCommand> hostRoleCommands = new LinkedList<>(); private TestStage() { - super(1L, "", "", 1L, "", "", "", "", hostRoleCommandFactory, ecwFactory); + super(1L, "", "", 1L, "", "", "", hostRoleCommandFactory, ecwFactory); } void setHostRoleCommands(Collection<HostRoleCommandEntity> tasks) { http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 8f7b31d..eaf54c3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -337,7 +337,7 @@ public class ClusterStackVersionResourceProviderTest { // Check that we create proper stage count expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), anyLong(), - anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyObject(String.class), anyObject(String.class), anyObject(String.class))).andReturn(stage). times((int) Math.ceil(hostCount / MAX_TASKS_PER_STAGE)); @@ -555,7 +555,7 @@ public class ClusterStackVersionResourceProviderTest { // Check that we create proper stage count expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), anyLong(), - anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyObject(String.class), anyObject(String.class), anyObject(String.class))).andReturn(stage). times((int) Math.ceil(hostCount / MAX_TASKS_PER_STAGE)); @@ -784,7 +784,7 @@ public class ClusterStackVersionResourceProviderTest { // Check that we create proper stage count expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), anyLong(), - anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyObject(String.class), anyObject(String.class), anyObject(String.class))).andReturn(stage). times((int) Math.ceil(hostCount / MAX_TASKS_PER_STAGE)); @@ -1027,7 +1027,7 @@ public class ClusterStackVersionResourceProviderTest { // Check that we create proper stage count expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), anyLong(), - anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyObject(String.class), anyObject(String.class), anyObject(String.class))).andReturn(stage). times((int) Math.ceil(hostCount / MAX_TASKS_PER_STAGE)); @@ -1557,7 +1557,7 @@ public class ClusterStackVersionResourceProviderTest { // Check that we create proper stage count expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), anyLong(), - anyObject(String.class), anyObject(String.class), anyObject(String.class), + anyObject(String.class), anyObject(String.class), anyObject(String.class))).andReturn(stage). times((int) Math.ceil(hostCount / MAX_TASKS_PER_STAGE)); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java index f60915c..4fcc814 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.controller.internal; +import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.expect; @@ -143,7 +144,7 @@ public class RequestStageContainerTest { stages.add(stage2); //expectations - expect(requestFactory.createNewFromStages(stages)).andReturn(request); + expect(requestFactory.createNewFromStages(stages, "{}")).andReturn(request); expect(request.getStages()).andReturn(stages).anyTimes(); actionManager.sendActions(request, null); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java index e8eb3e8..56dd1e2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java @@ -217,8 +217,8 @@ public class UserHookServiceTest extends EasyMockSupport { // TBD refine expectations to validate the logic / eg capture arguments stageMock.addServerActionCommand(EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyObject(Role.class), EasyMock.anyObject(RoleCommand.class), EasyMock.anyString(), EasyMock.anyObject(ServiceComponentHostServerActionEvent.class), EasyMock.<Map<String, String>>anyObject(), EasyMock.anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject(), EasyMock.anyInt(), EasyMock.anyBoolean(), EasyMock.anyBoolean()); - EasyMock.expect(requestFactoryMock.createNewFromStages(Arrays.asList(stageMock))).andReturn(null); - EasyMock.expect(stageFactoryMock.createNew(1, "/var/lib/ambari-server/tmp:1", "test-cluster", 1, "Post user creation hook for [ 1 ] users", "{}", "{}", "{}")).andReturn(stageMock); + EasyMock.expect(requestFactoryMock.createNewFromStages(Arrays.asList(stageMock), "{}")).andReturn(null); + EasyMock.expect(stageFactoryMock.createNew(1, "/var/lib/ambari-server/tmp:1", "test-cluster", 1, "Post user creation hook for [ 1 ] users", "{}", "{}")).andReturn(stageMock); replayAll(); http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java index 2feef41..4d1b48b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java @@ -127,7 +127,7 @@ public class ServerActionExecutorTest { final Request request = createMockRequest(); stageFactory = createNiceMock(StageFactory.class); - final Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 978, "context", CLUSTER_HOST_INFO, + final Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 978, "context", "{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}"); stage.addServerActionCommand(ManualStageAction.class.getName(), @@ -318,14 +318,13 @@ public class ServerActionExecutorTest { final int timeout) { stageFactory = createNiceMock(StageFactory.class); expect(stageFactory.createNew(anyLong(), anyObject(String.class), anyObject(String.class), - anyLong(), anyObject(String.class), anyObject(String.class), - anyObject(String.class), anyObject(String.class))). + anyLong(), anyObject(String.class), anyObject(String.class), anyObject(String.class))). andAnswer(new IAnswer<Stage>() { @Override public Stage answer() throws Throwable { Stage stage = stageFactory.createNew(requestId, "/tmp", "cluster1", - 1L, requestContext, CLUSTER_HOST_INFO, "{}", "{}"); + 1L, requestContext, "{}", "{}"); stage.setStageId(stageId); stage.addServerActionCommand(MockServerAction.class.getName(), null, @@ -338,7 +337,7 @@ public class ServerActionExecutorTest { } }); - Stage stage = stageFactory.createNew(requestId, "", "", 1L, "", "", "", ""); + Stage stage = stageFactory.createNew(requestId, "", "", 1L, "", "", ""); return stage; } http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java b/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java index 7063147..3e592b2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java @@ -126,7 +126,7 @@ public class TestStagePlanner { RoleGraph rg = roleGraphFactory.createNew(rco); long now = System.currentTimeMillis(); Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L, "execution command wrapper test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); stage.setStageId(1); stage.addServerActionCommand("RESTART", null, Role.HIVE_METASTORE, RoleCommand.CUSTOM_COMMAND, "cluster1", http://git-wip-us.apache.org/repos/asf/ambari/blob/f2bbe478/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java index e9bd27c..5b39086 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java @@ -194,7 +194,7 @@ public class StageUtilsTest extends EasyMockSupport { JsonMappingException, JAXBException, IOException { StageUtils stageUtils = new StageUtils(injector.getInstance(StageFactory.class)); Stage s = StageUtils.getATestStage(1, 2, "host1", "clusterHostInfo", "hostParamsStage"); - ExecutionCommand cmd = s.getExecutionCommands(getHostName()).get(0).getExecutionCommand(); + ExecutionCommand cmd = s.getExecutionCommands("host1").get(0).getExecutionCommand(); HashMap<String, Map<String, String>> configTags = new HashMap<>(); Map<String, String> globalTag = new HashMap<>(); globalTag.put("tag", "version1");