HDFS-9582. TestLeaseRecoveryStriped file missing Apache License header and not well formatted. (umamahesh)
This commit is contained in:
parent
7995a6ea4d
commit
52ad9125b8
|
@ -208,6 +208,9 @@ Trunk (Unreleased)
|
||||||
|
|
||||||
HDFS-8831. Trash Support for deletion in HDFS encryption zone. (xyao)
|
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
|
OPTIMIZATIONS
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
|
@ -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;
|
package org.apache.hadoop.hdfs;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
|
@ -31,7 +48,8 @@ import java.util.List;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
|
|
||||||
public class TestLeaseRecoveryStriped {
|
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_DATA_BLOCKS = StripedFileTestUtil.NUM_DATA_BLOCKS;
|
||||||
private static final int NUM_PARITY_BLOCKS = StripedFileTestUtil.NUM_PARITY_BLOCKS;
|
private static final int NUM_PARITY_BLOCKS = StripedFileTestUtil.NUM_PARITY_BLOCKS;
|
||||||
|
@ -83,30 +101,25 @@ public class TestLeaseRecoveryStriped {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final int[][][] BLOCK_LENGTHS_SUITE = {
|
public static final int[][][] BLOCK_LENGTHS_SUITE = {
|
||||||
{{ 11 * CELL_SIZE,10 * CELL_SIZE, 9 * CELL_SIZE,
|
{ { 11 * CELL_SIZE, 10 * CELL_SIZE, 9 * CELL_SIZE, 8 * CELL_SIZE,
|
||||||
8 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE,
|
7 * CELL_SIZE, 6 * CELL_SIZE, 5 * CELL_SIZE, 4 * CELL_SIZE,
|
||||||
5 * CELL_SIZE, 4 * CELL_SIZE, 3 * CELL_SIZE},
|
3 * CELL_SIZE }, { 36 * CELL_SIZE } },
|
||||||
{36 * CELL_SIZE}},
|
|
||||||
|
|
||||||
{{ 3 * CELL_SIZE, 4 * CELL_SIZE, 5 * CELL_SIZE,
|
{ { 3 * CELL_SIZE, 4 * CELL_SIZE, 5 * CELL_SIZE, 6 * CELL_SIZE,
|
||||||
6 * CELL_SIZE, 7 * CELL_SIZE, 8 * CELL_SIZE,
|
7 * CELL_SIZE, 8 * CELL_SIZE, 9 * CELL_SIZE, 10 * CELL_SIZE,
|
||||||
9 * CELL_SIZE,10 * CELL_SIZE,11 * CELL_SIZE},
|
11 * CELL_SIZE }, { 36 * CELL_SIZE } },
|
||||||
{36 * CELL_SIZE}},
|
|
||||||
|
|
||||||
{{ 11 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE,
|
{ { 11 * CELL_SIZE, 7 * CELL_SIZE, 6 * CELL_SIZE, 5 * CELL_SIZE,
|
||||||
5 * CELL_SIZE, 4 * CELL_SIZE, 2 * CELL_SIZE,
|
4 * CELL_SIZE, 2 * CELL_SIZE, 9 * CELL_SIZE, 10 * CELL_SIZE,
|
||||||
9 * CELL_SIZE,10 * CELL_SIZE,11 * CELL_SIZE},
|
11 * CELL_SIZE }, { 36 * CELL_SIZE } },
|
||||||
{36 * CELL_SIZE}},
|
|
||||||
|
|
||||||
{ { 8 * CELL_SIZE + bytesPerChecksum,
|
{ { 8 * CELL_SIZE + bytesPerChecksum,
|
||||||
7 * CELL_SIZE + bytesPerChecksum * 2,
|
7 * CELL_SIZE + bytesPerChecksum * 2,
|
||||||
6 * CELL_SIZE + bytesPerChecksum * 2,
|
6 * CELL_SIZE + bytesPerChecksum * 2,
|
||||||
5 * CELL_SIZE - bytesPerChecksum * 3,
|
5 * CELL_SIZE - bytesPerChecksum * 3,
|
||||||
4 * CELL_SIZE - bytesPerChecksum * 4,
|
4 * CELL_SIZE - bytesPerChecksum * 4,
|
||||||
3 * CELL_SIZE - bytesPerChecksum * 4,
|
3 * CELL_SIZE - bytesPerChecksum * 4, 9 * CELL_SIZE, 10 * CELL_SIZE,
|
||||||
9 * CELL_SIZE, 10 * CELL_SIZE, 11 * CELL_SIZE},
|
11 * CELL_SIZE }, { 36 * CELL_SIZE } }, };
|
||||||
{36 * CELL_SIZE}},
|
|
||||||
};
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testLeaseRecovery() throws Exception {
|
public void testLeaseRecovery() throws Exception {
|
||||||
|
@ -141,8 +154,8 @@ public class TestLeaseRecoveryStriped {
|
||||||
|
|
||||||
private void writePartialBlocks(int[] blockLengths) throws Exception {
|
private void writePartialBlocks(int[] blockLengths) throws Exception {
|
||||||
final FSDataOutputStream out = dfs.create(p);
|
final FSDataOutputStream out = dfs.create(p);
|
||||||
final DFSStripedOutputStream stripedOut
|
final DFSStripedOutputStream stripedOut = (DFSStripedOutputStream) out
|
||||||
= (DFSStripedOutputStream) out.getWrappedStream();
|
.getWrappedStream();
|
||||||
int length = (STRIPES_PER_BLOCK - 1) * STRIPE_SIZE;
|
int length = (STRIPES_PER_BLOCK - 1) * STRIPE_SIZE;
|
||||||
int[] posToKill = getPosToKill(blockLengths);
|
int[] posToKill = getPosToKill(blockLengths);
|
||||||
int checkingPos = nextCheckingPos(posToKill, 0);
|
int checkingPos = nextCheckingPos(posToKill, 0);
|
||||||
|
@ -180,13 +193,14 @@ public class TestLeaseRecoveryStriped {
|
||||||
int[] posToKill = new int[NUM_DATA_BLOCKS + NUM_PARITY_BLOCKS];
|
int[] posToKill = new int[NUM_DATA_BLOCKS + NUM_PARITY_BLOCKS];
|
||||||
for (int i = 0; i < NUM_DATA_BLOCKS; i++) {
|
for (int i = 0; i < NUM_DATA_BLOCKS; i++) {
|
||||||
int numStripe = (blockLengths[i] - 1) / CELL_SIZE;
|
int numStripe = (blockLengths[i] - 1) / CELL_SIZE;
|
||||||
posToKill[i] = numStripe * STRIPE_SIZE
|
posToKill[i] = numStripe * STRIPE_SIZE + i * CELL_SIZE
|
||||||
+ i * CELL_SIZE + blockLengths[i] % CELL_SIZE;
|
+ blockLengths[i] % CELL_SIZE;
|
||||||
if (blockLengths[i] % CELL_SIZE == 0) {
|
if (blockLengths[i] % CELL_SIZE == 0) {
|
||||||
posToKill[i] += CELL_SIZE;
|
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);
|
Preconditions.checkArgument(blockLengths[i] % CELL_SIZE == 0);
|
||||||
int numStripe = (blockLengths[i]) / CELL_SIZE;
|
int numStripe = (blockLengths[i]) / CELL_SIZE;
|
||||||
posToKill[i] = numStripe * STRIPE_SIZE;
|
posToKill[i] = numStripe * STRIPE_SIZE;
|
||||||
|
@ -226,7 +240,8 @@ public class TestLeaseRecoveryStriped {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void recoverLease() throws Exception {
|
private void recoverLease() throws Exception {
|
||||||
final DistributedFileSystem dfs2 = (DistributedFileSystem) getFSAsAnotherUser(conf);
|
final DistributedFileSystem dfs2 = (DistributedFileSystem) getFSAsAnotherUser(
|
||||||
|
conf);
|
||||||
try {
|
try {
|
||||||
GenericTestUtils.waitFor(new Supplier<Boolean>() {
|
GenericTestUtils.waitFor(new Supplier<Boolean>() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -246,8 +261,9 @@ public class TestLeaseRecoveryStriped {
|
||||||
private FileSystem getFSAsAnotherUser(final Configuration c)
|
private FileSystem getFSAsAnotherUser(final Configuration c)
|
||||||
throws IOException, InterruptedException {
|
throws IOException, InterruptedException {
|
||||||
return FileSystem.get(FileSystem.getDefaultUri(c), c,
|
return FileSystem.get(FileSystem.getDefaultUri(c), c,
|
||||||
UserGroupInformation.createUserForTesting(fakeUsername,
|
UserGroupInformation
|
||||||
new String[]{fakeGroup}).getUserName());
|
.createUserForTesting(fakeUsername, new String[] { fakeGroup })
|
||||||
|
.getUserName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void waitStreamerAllAcked(DataStreamer s) throws IOException {
|
public static void waitStreamerAllAcked(DataStreamer s) throws IOException {
|
||||||
|
|
Loading…
Reference in New Issue