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

…1584)
apache · Oct 4, 2019 · 3f16651 · 3f16651
1 parent 4510970
commit 3f16651
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -193,7 +193,6 @@ private KeyManagerImpl(OzoneManager om, ScmClient scmClient,
     this.secretManager = secretManager;
     this.kmsProvider = kmsProvider;
 
-    start(conf);
   }
 
   @Override

diff --git a/...-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java b/...-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyDeletingService.java
@@ -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 =