Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-963. Fix failure in TestOzoneShell due to null check in SecurityConfig. 

Contributed by Ajay Kumar.
This commit is contained in:
Anu Engineer 2019-01-04 13:13:10 -08:00 committed by Xiaoyu Yao
parent 1d5734e341
commit a5d0fcf704
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/SecurityConfig.java
View File

@ -129,8 +129,6 @@ public class SecurityConfig {
this.metadatDir = this.configuration.get(HDDS_METADATA_DIR_NAME, this.metadatDir = this.configuration.get(HDDS_METADATA_DIR_NAME,
configuration.get(OZONE_METADATA_DIRS, configuration.get(OZONE_METADATA_DIRS,
configuration.get(HDDS_DATANODE_DIR_KEY))); configuration.get(HDDS_DATANODE_DIR_KEY)));
Preconditions.checkNotNull(this.metadatDir, "Metadata directory can't be"
+ " null. Please check configs.");
this.keyDir = this.configuration.get(HDDS_KEY_DIR_NAME, this.keyDir = this.configuration.get(HDDS_KEY_DIR_NAME,
HDDS_KEY_DIR_NAME_DEFAULT); HDDS_KEY_DIR_NAME_DEFAULT);
this.privateKeyFileName = this.configuration.get(HDDS_PRIVATE_KEY_FILE_NAME, this.privateKeyFileName = this.configuration.get(HDDS_PRIVATE_KEY_FILE_NAME,
@ -248,6 +246,8 @@ public class SecurityConfig {
* @return path Key location. * @return path Key location.
*/ */
public Path getKeyLocation() { public Path getKeyLocation() {
Preconditions.checkNotNull(this.metadatDir, "Metadata directory can't be"
+ " null. Please check configs.");
return Paths.get(metadatDir, keyDir); return Paths.get(metadatDir, keyDir);
} }
@ -259,6 +259,8 @@ public class SecurityConfig {
* @return Path location. * @return Path location.
*/ */
public Path getKeyLocation(String component) { public Path getKeyLocation(String component) {
Preconditions.checkNotNull(this.metadatDir, "Metadata directory can't be"
+ " null. Please check configs.");
return Paths.get(metadatDir, component, keyDir); return Paths.get(metadatDir, component, keyDir);
} }
@ -268,6 +270,8 @@ public class SecurityConfig {
* @return path Key location. * @return path Key location.
*/ */
public Path getCertificateLocation() { public Path getCertificateLocation() {
Preconditions.checkNotNull(this.metadatDir, "Metadata directory can't be"
+ " null. Please check configs.");
return Paths.get(metadatDir, certificateDir); return Paths.get(metadatDir, certificateDir);
} }
@ -279,6 +283,8 @@ public class SecurityConfig {
* @return Path location. * @return Path location.
*/ */
public Path getCertificateLocation(String component) { public Path getCertificateLocation(String component) {
Preconditions.checkNotNull(this.metadatDir, "Metadata directory can't be"
+ " null. Please check configs.");
return Paths.get(metadatDir, component, certificateDir); return Paths.get(metadatDir, component, certificateDir);
} }