You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/08/12 23:54:03 UTC
ambari git commit: Revert "AMBARI-12688 HDFS check fails after move
NameNode on NN HA cluster (dsen)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.1 43ef14a43 -> eb3a82843
Revert "AMBARI-12688 HDFS check fails after move NameNode on NN HA cluster (dsen)"
This reverts commit e7498fa54da7c57a747e4029c56f940b175bcabd.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb3a8284
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb3a8284
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb3a8284
Branch: refs/heads/branch-2.1.1
Commit: eb3a82843e7ae9960fa43988957d3d9674ac54c9
Parents: 43ef14a
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Aug 12 14:53:24 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Aug 12 14:53:24 2015 -0700
----------------------------------------------------------------------
.../ambari/server/topology/LogicalRequest.java | 9 +--
.../ambari/server/topology/TopologyManager.java | 5 +-
.../apache/ambari/server/utils/StageUtils.java | 3 +-
.../server/controller/KerberosHelperTest.java | 2 +-
.../ambari/server/utils/StageUtilsTest.java | 63 +++++++++-----------
5 files changed, 35 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3a8284/ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java
index 9eb3598..b7f95cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/LogicalRequest.java
@@ -43,7 +43,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
@@ -179,15 +178,11 @@ public class LogicalRequest extends Request {
return new ArrayList<HostRequest>(allHostRequests);
}
- public Map<String, Collection<String>> getPendingHostComponents() {
+ public Map<String, Collection<String>> getProjectedTopology() {
Map<String, Collection<String>> hostComponentMap = new HashMap<String, Collection<String>>();
- Set<HostRequest> pendingRequests =
- new HashSet<HostRequest>(requestsWithReservedHosts.values());
- pendingRequests.addAll(outstandingHostRequests);
-
//todo: synchronization
- for (HostRequest hostRequest : pendingRequests) {
+ for (HostRequest hostRequest : allHostRequests) {
HostGroup hostGroup = hostRequest.getHostGroup();
for (String host : topology.getHostGroupInfo().get(hostGroup.getName()).getHostNames()) {
Collection<String> hostComponents = hostComponentMap.get(host);
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3a8284/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index 4f51d47..8e7fb7f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -287,13 +287,12 @@ public class TopologyManager {
return clusterTopologyMap.get(clusterName);
}
- public Map<String, Collection<String>> getPendingHostComponents() {
+ public Map<String, Collection<String>> getProjectedTopology() {
ensureInitialized();
Map<String, Collection<String>> hostComponentMap = new HashMap<String, Collection<String>>();
for (LogicalRequest logicalRequest : allRequests.values()) {
- Map<String, Collection<String>> requestTopology =
- logicalRequest.getPendingHostComponents();
+ Map<String, Collection<String>> requestTopology = logicalRequest.getProjectedTopology();
for (Map.Entry<String, Collection<String>> entry : requestTopology.entrySet()) {
String host = entry.getKey();
Collection<String> hostComponents = hostComponentMap.get(host);
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3a8284/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
index 4040cc1..3da0fe2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
@@ -277,8 +277,7 @@ public class StageUtils {
}
// add hosts from topology manager
- Map<String, Collection<String>> pendingHostComponents =
- topologyManager.getPendingHostComponents();
+ Map<String, Collection<String>> pendingHostComponents = topologyManager.getProjectedTopology();
for (String hostname : pendingHostComponents.keySet()) {
if (!hostsSet.contains(hostname)) {
hostsSet.add(hostname);
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3a8284/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 bf79144..5d84fbc 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
@@ -194,7 +194,7 @@ public class KerberosHelperTest extends EasyMockSupport {
setClusterController();
//todo: StageUtils shouldn't be called for this test
StageUtils.setTopologyManager(topologyManager);
- expect(topologyManager.getPendingHostComponents()).andReturn(
+ expect(topologyManager.getProjectedTopology()).andReturn(
Collections.<String, Collection<String>>emptyMap()).anyTimes();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/eb3a8284/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 a362e8b..e85d9a1 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
@@ -32,7 +32,6 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -297,7 +296,7 @@ public class StageUtilsTest extends EasyMockSupport {
final ServiceComponentHost nns7ServiceComponentHost = createMock(ServiceComponentHost.class);
expect(nns7ServiceComponentHost.getComponentAdminState()).andReturn(HostComponentAdminState.INSERVICE).anyTimes();
- Map<String, Collection<String>> pendingHostComponents = new HashMap<String, Collection<String>>();
+ Map<String, Collection<String>> projectedTopology = new HashMap<String, Collection<String>>();
final HashMap<String, ServiceComponentHost> nnServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
@@ -305,14 +304,14 @@ public class StageUtilsTest extends EasyMockSupport {
put("h0", nnh0ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "NAMENODE", nnServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "NAMENODE", nnServiceComponentHosts.keySet());
final HashMap<String, ServiceComponentHost> snnServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
put("h1", snnh1ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "SECONDARY_NAMENODE", snnServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "SECONDARY_NAMENODE", snnServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> dnServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
@@ -326,14 +325,14 @@ public class StageUtilsTest extends EasyMockSupport {
put("h9", dnh9ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "DATANODE", dnServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "DATANODE", dnServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> hbmServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
put("h5", hbm5ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "HBASE_MASTER", hbmServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "HBASE_MASTER", hbmServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> hbrsServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
@@ -344,14 +343,14 @@ public class StageUtilsTest extends EasyMockSupport {
put("h9", hbrs9ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "HBASE_REGIONSERVER", hbrsServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "HBASE_REGIONSERVER", hbrsServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> mrjtServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
put("h5", mrjt5ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "JOBTRACKER", mrjtServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "JOBTRACKER", mrjtServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> mrttServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
{
@@ -364,7 +363,7 @@ public class StageUtilsTest extends EasyMockSupport {
put("h9", mrtt9ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "TASKTRACKER", mrttServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "TASKTRACKER", mrttServiceComponentHosts.keySet());
final Map<String, ServiceComponentHost> nnsServiceComponentHosts = new HashMap<String, ServiceComponentHost>() {
@@ -372,7 +371,7 @@ public class StageUtilsTest extends EasyMockSupport {
put("h7", nns7ServiceComponentHost);
}
};
- insertTopology(pendingHostComponents, "NONAME_SERVER", nnsServiceComponentHosts.keySet());
+ insertTopology(projectedTopology, "NONAME_SERVER", nnsServiceComponentHosts.keySet());
final ServiceComponent nnComponent = createMock(ServiceComponent.class);
expect(nnComponent.getName()).andReturn("NAMENODE").anyTimes();
@@ -518,8 +517,8 @@ public class StageUtilsTest extends EasyMockSupport {
final TopologyManager topologyManager = injector.getInstance(TopologyManager.class);
- topologyManager.getPendingHostComponents();
- expectLastCall().andReturn(Collections.emptyMap()).once();
+ topologyManager.getProjectedTopology();
+ expectLastCall().andReturn(projectedTopology).once();
replayAll();
@@ -538,14 +537,14 @@ public class StageUtilsTest extends EasyMockSupport {
assertTrue(allHosts.contains(host.getHostName()));
}
- checkServiceHostIndexes(info, "DATANODE", "slave_hosts", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "NAMENODE", "namenode_host", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "SECONDARY_NAMENODE", "snamenode_host", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "HBASE_MASTER", "hbase_master_hosts", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "HBASE_REGIONSERVER", "hbase_rs_hosts", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "JOBTRACKER", "jtnode_host", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "TASKTRACKER", "mapred_tt_hosts", pendingHostComponents, hostNames);
- checkServiceHostIndexes(info, "NONAME_SERVER", "noname_server_hosts", pendingHostComponents, hostNames);
+ checkServiceHostIndexes(info, "DATANODE", "slave_hosts", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "NAMENODE", "namenode_host", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "SECONDARY_NAMENODE", "snamenode_host", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "HBASE_MASTER", "hbase_master_hosts", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "HBASE_REGIONSERVER", "hbase_rs_hosts", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "JOBTRACKER", "jtnode_host", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "TASKTRACKER", "mapred_tt_hosts", projectedTopology, hostNames);
+ checkServiceHostIndexes(info, "NONAME_SERVER", "noname_server_hosts", projectedTopology, hostNames);
Set<String> actualPingPorts = info.get(StageUtils.PORTS);
if (pingPorts.contains(null)) {
@@ -579,14 +578,14 @@ public class StageUtilsTest extends EasyMockSupport {
// Validate substitutions...
info = StageUtils.substituteHostIndexes(info);
- checkServiceHostNames(info, "DATANODE", "slave_hosts", pendingHostComponents);
- checkServiceHostNames(info, "NAMENODE", "namenode_host", pendingHostComponents);
- checkServiceHostNames(info, "SECONDARY_NAMENODE", "snamenode_host", pendingHostComponents);
- checkServiceHostNames(info, "HBASE_MASTER", "hbase_master_hosts", pendingHostComponents);
- checkServiceHostNames(info, "HBASE_REGIONSERVER", "hbase_rs_hosts", pendingHostComponents);
- checkServiceHostNames(info, "JOBTRACKER", "jtnode_host", pendingHostComponents);
- checkServiceHostNames(info, "TASKTRACKER", "mapred_tt_hosts", pendingHostComponents);
- checkServiceHostNames(info, "NONAME_SERVER", "noname_server_hosts", pendingHostComponents);
+ checkServiceHostNames(info, "DATANODE", "slave_hosts", projectedTopology);
+ checkServiceHostNames(info, "NAMENODE", "namenode_host", projectedTopology);
+ checkServiceHostNames(info, "SECONDARY_NAMENODE", "snamenode_host", projectedTopology);
+ checkServiceHostNames(info, "HBASE_MASTER", "hbase_master_hosts", projectedTopology);
+ checkServiceHostNames(info, "HBASE_REGIONSERVER", "hbase_rs_hosts", projectedTopology);
+ checkServiceHostNames(info, "JOBTRACKER", "jtnode_host", projectedTopology);
+ checkServiceHostNames(info, "TASKTRACKER", "mapred_tt_hosts", projectedTopology);
+ checkServiceHostNames(info, "NONAME_SERVER", "noname_server_hosts", projectedTopology);
}
private void insertTopology(Map<String, Collection<String>> projectedTopology, String componentName, Set<String> hostNames) {
@@ -604,12 +603,8 @@ public class StageUtilsTest extends EasyMockSupport {
}
}
- private void checkServiceHostIndexes(Map<String, Set<String>> info,
- String componentName,
- String mappedComponentName,
- Map<String, Collection<String>> serviceTopology,
- List<String> hostList) {
-
+ private void checkServiceHostIndexes(Map<String, Set<String>> info, String componentName, String mappedComponentName,
+ Map<String, Collection<String>> serviceTopology, List<String> hostList) {
Set<Integer> expectedHostsList = new HashSet<Integer>();
Set<Integer> actualHostsList = new HashSet<Integer>();