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

HDDS-2237. KeyDeletingService throws NPE if it's started too early (#1584)

Browse Source
This commit is contained in:
Elek, Márton 2019-10-04 18:48:49 +02:00 committed by Bharat Viswanadham
parent 4510970e2f
commit 3f166512af
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View File

@ -193,7 +193,6 @@ private KeyManagerImpl(OzoneManager om, ScmClient scmClient,
this.secretManager = secretManager;
this.kmsProvider = kmsProvider;
start(conf);
}
@Override

3
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
View File

@ -95,6 +95,7 @@ public void checkIfDeleteServiceisDeletingKeys()
new KeyManagerImpl(
new ScmBlockLocationTestingClient(null, null, 0),
metaMgr, conf, UUID.randomUUID().toString(), null);
keyManager.start(conf);
final int keyCount = 100;
createAndDeleteKeys(keyManager, keyCount, 1);
KeyDeletingService keyDeletingService =
@ -117,6 +118,7 @@ public void checkIfDeleteServiceWithFailingSCM()
new KeyManagerImpl(
new ScmBlockLocationTestingClient(null, null, 1),
metaMgr, conf, UUID.randomUUID().toString(), null);
keyManager.start(conf);
final int keyCount = 100;
createAndDeleteKeys(keyManager, keyCount, 1);
KeyDeletingService keyDeletingService =
@ -144,6 +146,7 @@ public void checkDeletionForEmptyKey()
new KeyManagerImpl(
new ScmBlockLocationTestingClient(null, null, 1),
metaMgr, conf, UUID.randomUUID().toString(), null);
keyManager.start(conf);
final int keyCount = 100;
createAndDeleteKeys(keyManager, keyCount, 0);
KeyDeletingService keyDeletingService =