From d4efbe661406b2949fb222f4b08a64357434fa6f Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Thu, 31 Oct 2019 21:31:01 -0700 Subject: [PATCH 1/3] HDDS-2397. Fix calling cleanup for few missing tables in OM. --- .../hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java index 1c7173f5b56d..3a2b60cbb8f3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java @@ -228,6 +228,10 @@ private void cleanupCache(long lastRatisTransactionIndex) { omMetadataManager.getS3Table().cleanupCache(lastRatisTransactionIndex); omMetadataManager.getMultipartInfoTable().cleanupCache( lastRatisTransactionIndex); + omMetadataManager.getS3SecretTable().cleanupCache(lastRatisTransactionIndex); + omMetadataManager.getPrefixTable().cleanupCache(lastRatisTransactionIndex); + omMetadataManager.getDelegationTokenTable().cleanupCache( + lastRatisTransactionIndex); } From 373f9b644273ee40f1b51c800a754f11f6ddc308 Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Thu, 31 Oct 2019 21:56:34 -0700 Subject: [PATCH 2/3] fix checkstyle --- .../hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java index 3a2b60cbb8f3..11a70a67acfb 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java @@ -228,10 +228,11 @@ private void cleanupCache(long lastRatisTransactionIndex) { omMetadataManager.getS3Table().cleanupCache(lastRatisTransactionIndex); omMetadataManager.getMultipartInfoTable().cleanupCache( lastRatisTransactionIndex); - omMetadataManager.getS3SecretTable().cleanupCache(lastRatisTransactionIndex); - omMetadataManager.getPrefixTable().cleanupCache(lastRatisTransactionIndex); + omMetadataManager.getS3SecretTable().cleanupCache( + lastRatisTransactionIndex); omMetadataManager.getDelegationTokenTable().cleanupCache( lastRatisTransactionIndex); + omMetadataManager.getPrefixTable().cleanupCache(lastRatisTransactionIndex); } From 5c55f24df5b5d19c190fcbf4f754b53f16d8b293 Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Fri, 1 Nov 2019 11:23:36 -0700 Subject: [PATCH 3/3] fix checkstyle. --- .../apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java index 11a70a67acfb..751624408c23 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java @@ -229,7 +229,7 @@ private void cleanupCache(long lastRatisTransactionIndex) { omMetadataManager.getMultipartInfoTable().cleanupCache( lastRatisTransactionIndex); omMetadataManager.getS3SecretTable().cleanupCache( - lastRatisTransactionIndex); + lastRatisTransactionIndex); omMetadataManager.getDelegationTokenTable().cleanupCache( lastRatisTransactionIndex); omMetadataManager.getPrefixTable().cleanupCache(lastRatisTransactionIndex);