Repository: hadoop Updated Branches: refs/heads/branch-2 ec4159c4d -> ba2eab912
HADOOP-15023. ValueQueue should also validate (int) (lowWatermark * numValues) > 0 on construction. (cherry picked from commit b1941b200d6b4fa6a7891421c0a1e212cad3d6eb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba2eab91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba2eab91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba2eab91 Branch: refs/heads/branch-2 Commit: ba2eab9122f8c5b279c657f4750c74accb9a6407 Parents: ec4159c Author: Xiao Chen <x...@apache.org> Authored: Wed Nov 15 16:43:25 2017 -0800 Committer: Xiao Chen <x...@apache.org> Committed: Wed Nov 15 16:45:06 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba2eab91/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java index 4aeeeef..d5e9a70 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/ValueQueue.java @@ -164,6 +164,9 @@ public class ValueQueue <E> { Preconditions.checkArgument(numValues > 0, "\"numValues\" must be > 0"); Preconditions.checkArgument(((lowWatermark > 0)&&(lowWatermark <= 1)), "\"lowWatermark\" must be > 0 and <= 1"); + final int watermarkValue = (int) (numValues * lowWatermark); + Preconditions.checkArgument(watermarkValue > 0, + "(int) (\"numValues\" * \"lowWatermark\") must be > 0"); Preconditions.checkArgument(expiry > 0, "\"expiry\" must be > 0"); Preconditions.checkArgument(numFillerThreads > 0, "\"numFillerThreads\" must be > 0"); @@ -180,8 +183,7 @@ public class ValueQueue <E> { throws Exception { LinkedBlockingQueue<E> keyQueue = new LinkedBlockingQueue<E>(); - refiller.fillQueueForKey(keyName, keyQueue, - (int)(lowWatermark * numValues)); + refiller.fillQueueForKey(keyName, keyQueue, watermarkValue); return keyQueue; } }); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
