From 786aaca2abe032eaf198c1bebd5b2115be8f6af0 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Wed, 11 Jul 2012 16:10:50 +0000 Subject: [PATCH] HDFS-3615. Two BlockTokenSecretManager findbugs warnings. Contributed by Aaron T. Myers. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360256 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../security/token/block/BlockTokenSecretManager.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2b6d5e0e0a3..a1a9e809104 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -299,6 +299,8 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3548. NamenodeFsck.copyBlock fails to create a Block Reader. (Colin Patrick McCabe via eli) + HDFS-3615. Two BlockTokenSecretManager findbugs warnings. (atm) + BREAKDOWN OF HDFS-3042 SUBTASKS HDFS-2185. HDFS portion of ZK-based FailoverController (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java index 832b0e75141..35e4c687c7d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java @@ -116,7 +116,7 @@ private BlockTokenSecretManager(boolean isMaster, long keyUpdateInterval, } @VisibleForTesting - public void setSerialNo(int serialNo) { + public synchronized void setSerialNo(int serialNo) { this.serialNo = (serialNo & LOW_MASK) | (nnIndex << 31); } @@ -189,7 +189,7 @@ public synchronized void addKeys(ExportedBlockKeys exportedKeys) * Update block keys if update time > update interval. * @return true if the keys are updated. */ - public boolean updateKeys(final long updateTime) throws IOException { + public synchronized boolean updateKeys(final long updateTime) throws IOException { if (updateTime > keyUpdateInterval) { return updateKeys(); } @@ -371,7 +371,7 @@ public byte[] retrievePassword(BlockTokenIdentifier identifier) } @VisibleForTesting - public void setKeyUpdateIntervalForTesting(long millis) { + public synchronized void setKeyUpdateIntervalForTesting(long millis) { this.keyUpdateInterval = millis; } @@ -381,7 +381,7 @@ public void clearAllKeysForTesting() { } @VisibleForTesting - public int getSerialNoForTesting() { + public synchronized int getSerialNoForTesting() { return serialNo; }