You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by na...@apache.org on 2019/09/17 11:13:14 UTC

[hadoop] 03/03: HDDS-2132. TestKeyValueContainer is failing (#1457).

This is an automated email from the ASF dual-hosted git repository.

nanda pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 0fb42e514be56a43d732f1f7efc67171dd0224e1
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Sep 17 11:01:33 2019 +0200

    HDDS-2132. TestKeyValueContainer is failing (#1457).
    
    (cherry picked from commit e54977f888e1a855e9f88b9fa41e0c8794bd0881)
---
 .../ozone/container/keyvalue/helpers/KeyValueContainerUtil.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
index c0e7d78..2c02ad5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
@@ -198,8 +198,9 @@ public final class KeyValueContainerUtil {
       kvContainerData.setKeyCount(liveKeys.size());
       byte[] bcsId = metadata.getStore().get(DFSUtil.string2Bytes(
           OzoneConsts.BLOCK_COMMIT_SEQUENCE_ID_PREFIX));
-      Preconditions.checkNotNull(bcsId);
-      kvContainerData.updateBlockCommitSequenceId(Longs.fromByteArray(bcsId));
+      if (bcsId != null) {
+        kvContainerData.updateBlockCommitSequenceId(Longs.fromByteArray(bcsId));
+      }
     }
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org