Repository: hadoop Updated Branches: refs/heads/trunk 7995a6ea4 -> 52ad9125b
HDFS-9582. TestLeaseRecoveryStriped file missing Apache License header and not well formatted. (umamahesh) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/52ad9125 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/52ad9125 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/52ad9125 Branch: refs/heads/trunk Commit: 52ad9125b8fbf1b4a92ef30969f0ec4c5f9d9852 Parents: 7995a6e Author: Uma Mahesh <umamah...@apache.org> Authored: Sun Dec 20 13:10:57 2015 -0800 Committer: Uma Mahesh <umamah...@apache.org> Committed: Sun Dec 20 13:10:57 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../hadoop/hdfs/TestLeaseRecoveryStriped.java | 84 ++++++++++++-------- 2 files changed, 53 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/52ad9125/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 920aab4..7e67560 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -208,6 +208,9 @@ Trunk (Unreleased) HDFS-8831. Trash Support for deletion in HDFS encryption zone. (xyao) + HDFS-9582. TestLeaseRecoveryStriped file missing Apache License header + and not well formatted. (umamahesh) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/52ad9125/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecoveryStriped.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecoveryStriped.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecoveryStriped.java index 38ee67a..bb4e929 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecoveryStriped.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecoveryStriped.java @@ -1,3 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.hadoop.hdfs; import com.google.common.base.Preconditions; @@ -31,7 +48,8 @@ import java.util.List; import java.util.concurrent.TimeoutException; public class TestLeaseRecoveryStriped { - public static final Log LOG = LogFactory.getLog(TestLeaseRecoveryStriped.class); + public static final Log LOG = LogFactory + .getLog(TestLeaseRecoveryStriped.class); private static final int NUM_DATA_BLOCKS = StripedFileTestUtil.NUM_DATA_BLOCKS; private static final int NUM_PARITY_BLOCKS = StripedFileTestUtil.NUM_PARITY_BLOCKS; @@ -83,39 +101,34 @@ public class TestLeaseRecoveryStriped { } public static final int[][][] BLOCK_LENGTHS_SUITE = { - {{ 11 * CELL_SIZE,10 * CELL_SIZE, 9 * CELL_SIZE, - 8 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE, - 5 * CELL_SIZE, 4 * CELL_SIZE, 3 * CELL_SIZE}, - {36 * CELL_SIZE}}, + { { 11 * CELL_SIZE, 10 * CELL_SIZE, 9 * CELL_SIZE, 8 * CELL_SIZE, + 7 * CELL_SIZE, 6 * CELL_SIZE, 5 * CELL_SIZE, 4 * CELL_SIZE, + 3 * CELL_SIZE }, { 36 * CELL_SIZE } }, - {{ 3 * CELL_SIZE, 4 * CELL_SIZE, 5 * CELL_SIZE, - 6 * CELL_SIZE, 7 * CELL_SIZE, 8 * CELL_SIZE, - 9 * CELL_SIZE,10 * CELL_SIZE,11 * CELL_SIZE}, - {36 * CELL_SIZE}}, + { { 3 * CELL_SIZE, 4 * CELL_SIZE, 5 * CELL_SIZE, 6 * CELL_SIZE, + 7 * CELL_SIZE, 8 * CELL_SIZE, 9 * CELL_SIZE, 10 * CELL_SIZE, + 11 * CELL_SIZE }, { 36 * CELL_SIZE } }, - {{ 11 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE, - 5 * CELL_SIZE, 4 * CELL_SIZE, 2 * CELL_SIZE, - 9 * CELL_SIZE,10 * CELL_SIZE,11 * CELL_SIZE}, - {36 * CELL_SIZE}}, + { { 11 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE, 5 * CELL_SIZE, + 4 * CELL_SIZE, 2 * CELL_SIZE, 9 * CELL_SIZE, 10 * CELL_SIZE, + 11 * CELL_SIZE }, { 36 * CELL_SIZE } }, - {{ 8 * CELL_SIZE + bytesPerChecksum, + { { 8 * CELL_SIZE + bytesPerChecksum, 7 * CELL_SIZE + bytesPerChecksum * 2, 6 * CELL_SIZE + bytesPerChecksum * 2, 5 * CELL_SIZE - bytesPerChecksum * 3, 4 * CELL_SIZE - bytesPerChecksum * 4, - 3 * CELL_SIZE - bytesPerChecksum * 4, - 9 * CELL_SIZE, 10 * CELL_SIZE, 11 * CELL_SIZE}, - {36 * CELL_SIZE}}, - }; + 3 * CELL_SIZE - bytesPerChecksum * 4, 9 * CELL_SIZE, 10 * CELL_SIZE, + 11 * CELL_SIZE }, { 36 * CELL_SIZE } }, }; @Test public void testLeaseRecovery() throws Exception { - for(int i=0; i < BLOCK_LENGTHS_SUITE.length; i++){ + for (int i = 0; i < BLOCK_LENGTHS_SUITE.length; i++) { int[] blockLengths = BLOCK_LENGTHS_SUITE[i][0]; int safeLength = BLOCK_LENGTHS_SUITE[i][1][0]; try { runTest(blockLengths, safeLength); - } catch (Throwable e){ + } catch (Throwable e) { String msg = "failed testCase at i=" + i + ", blockLengths=" + Arrays.toString(blockLengths) + "\n" + StringUtils.stringifyException(e); @@ -141,8 +154,8 @@ public class TestLeaseRecoveryStriped { private void writePartialBlocks(int[] blockLengths) throws Exception { final FSDataOutputStream out = dfs.create(p); - final DFSStripedOutputStream stripedOut - = (DFSStripedOutputStream) out.getWrappedStream(); + final DFSStripedOutputStream stripedOut = (DFSStripedOutputStream) out + .getWrappedStream(); int length = (STRIPES_PER_BLOCK - 1) * STRIPE_SIZE; int[] posToKill = getPosToKill(blockLengths); int checkingPos = nextCheckingPos(posToKill, 0); @@ -180,13 +193,14 @@ public class TestLeaseRecoveryStriped { int[] posToKill = new int[NUM_DATA_BLOCKS + NUM_PARITY_BLOCKS]; for (int i = 0; i < NUM_DATA_BLOCKS; i++) { int numStripe = (blockLengths[i] - 1) / CELL_SIZE; - posToKill[i] = numStripe * STRIPE_SIZE - + i * CELL_SIZE + blockLengths[i] % CELL_SIZE; + posToKill[i] = numStripe * STRIPE_SIZE + i * CELL_SIZE + + blockLengths[i] % CELL_SIZE; if (blockLengths[i] % CELL_SIZE == 0) { posToKill[i] += CELL_SIZE; } } - for (int i = NUM_DATA_BLOCKS; i < NUM_DATA_BLOCKS+NUM_PARITY_BLOCKS; i++) { + for (int i = NUM_DATA_BLOCKS; i < NUM_DATA_BLOCKS + + NUM_PARITY_BLOCKS; i++) { Preconditions.checkArgument(blockLengths[i] % CELL_SIZE == 0); int numStripe = (blockLengths[i]) / CELL_SIZE; posToKill[i] = numStripe * STRIPE_SIZE; @@ -194,10 +208,10 @@ public class TestLeaseRecoveryStriped { return posToKill; } - private List<Integer> getIndexToStop(int[] posToKill, int pos){ - List<Integer> indices=new LinkedList<>(); - for(int i=0;i<posToKill.length;i++){ - if(pos==posToKill[i]){ + private List<Integer> getIndexToStop(int[] posToKill, int pos) { + List<Integer> indices = new LinkedList<>(); + for (int i = 0; i < posToKill.length; i++) { + if (pos == posToKill[i]) { indices.add(i); } } @@ -214,8 +228,8 @@ public class TestLeaseRecoveryStriped { } }, 100, 3000); } catch (TimeoutException e) { - throw new IOException("Timeout waiting for streamer " + s +". Sent=" - + s.bytesSent + ", expected="+byteSent); + throw new IOException("Timeout waiting for streamer " + s + ". Sent=" + + s.bytesSent + ", expected=" + byteSent); } } @@ -226,7 +240,8 @@ public class TestLeaseRecoveryStriped { } private void recoverLease() throws Exception { - final DistributedFileSystem dfs2 = (DistributedFileSystem) getFSAsAnotherUser(conf); + final DistributedFileSystem dfs2 = (DistributedFileSystem) getFSAsAnotherUser( + conf); try { GenericTestUtils.waitFor(new Supplier<Boolean>() { @Override @@ -246,8 +261,9 @@ public class TestLeaseRecoveryStriped { private FileSystem getFSAsAnotherUser(final Configuration c) throws IOException, InterruptedException { return FileSystem.get(FileSystem.getDefaultUri(c), c, - UserGroupInformation.createUserForTesting(fakeUsername, - new String[]{fakeGroup}).getUserName()); + UserGroupInformation + .createUserForTesting(fakeUsername, new String[] { fakeGroup }) + .getUserName()); } public static void waitStreamerAllAcked(DataStreamer s) throws IOException {
