Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDDS-2064. OzoneManagerRatisServer#newOMRatisServer throws NPE when OM HA is configured incorrectly #1398

Closed
wants to merge 7 commits into from
Closed

HDDS-2064. OzoneManagerRatisServer#newOMRatisServer throws NPE when OM HA is configured incorrectly #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5eaa1ef
HDDS-2064. OzoneManagerRatisServer#newOMRatisServer throws NPE when OM
smengcl Aug 30, 2019
5e59dc2
Make testWrongConfiguration and testMultipleOMServiceIds happy.
smengcl Sep 3, 2019
97ed7f4
Initialize this.peerNodes instead to eliminate OzoneManagerRatisServe…
smengcl Sep 4, 2019
c3a37cd
Clean up dead code. Remove assert.
smengcl Sep 4, 2019
fd122ac
Amend unit tests.
smengcl Sep 4, 2019
8b90760
Remove unused import.
smengcl Sep 4, 2019
fe2a9b1
Remove more unused imports.
smengcl Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions ...egration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,45 @@ public void testWrongConfiguration() throws Exception {
}
}

/**
* A configuration with an empty node list while service ID is configured
* Should successfully start with no NPEs.
* @throws Exception
*/
@Test
public void testNoOMNodes() throws Exception {
String omServiceId = "om-service-test1";
conf.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, omServiceId);
// Deliberately skip OZONE_OM_NODES_KEY and OZONE_OM_ADDRESS_KEY config

// Should successfully start with no NPEs
startCluster();
}

/**
* A configuration with no OM addresses while service ID is configured.
* Should successfully start with no NPEs.
* @throws Exception
*/
@Test
public void testNoOMAddrs() throws Exception {
String omServiceId = "om-service-test1";

String omNode1Id = "omNode1";
String omNode2Id = "omNode2";
String omNode3Id = "omNode3";
String omNodesKeyValue = omNode1Id + "," + omNode2Id + "," + omNode3Id;
String omNodesKey = OmUtils.addKeySuffixes(
OMConfigKeys.OZONE_OM_NODES_KEY, omServiceId);

conf.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, omServiceId);
conf.set(omNodesKey, omNodesKeyValue);
// Deliberately skip OZONE_OM_ADDRESS_KEY config

// Should successfully start with no NPEs
startCluster();
}

/**
* Test multiple OM service configuration.
*/
Expand Down
4 changes: 4 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,10 @@ private void loadOMHAConfigs(Configuration conf) {
InetSocketAddress omAddress = OmUtils.getOmAddress(conf);
int ratisPort = conf.getInt(OZONE_OM_RATIS_PORT_KEY,
OZONE_OM_RATIS_PORT_DEFAULT);
// HDDS-2064: this.peerNodes would be null at this point because
// it is not initialized, we want to initialize it as an empty list
// to prevent NPE in OzoneManagerRatisServer#newOMRatisServer.
this.peerNodes = new ArrayList<>();

LOG.info("Configuration either no {} set. Falling back to the default " +
"OM address {}", OZONE_OM_ADDRESS_KEY, omAddress);
Expand Down