Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dev-support/bin/hadoop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@ function shadedclient_rebuild

extra=(
"-Dtest=NoUnitTests"
"-Dsurefire.failIfNoSpecifiedTests=false"
"-Dmaven.javadoc.skip=true"
"-Dcheckstyle.skip=true"
"-Dspotbugs.skip=true"
Expand Down Expand Up @@ -615,7 +614,7 @@ function shadedclient_rebuild
echo_and_redirect "${logfile}" \
"${MAVEN}" "${MAVEN_ARGS[@]}" verify -fae --batch-mode -am \
"${modules[@]}" \
-DskipShade -Dtest=NoUnitTests -Dsurefire.failIfNoSpecifiedTests=false -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true \
-DskipShade -Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true \
-Dspotbugs.skip=true ${extra[*]}

count=$("${GREP}" -c '\[ERROR\]' "${logfile}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,6 @@ protected LocatedBlock nextBlockOutputStream() throws IOException {
do {
errorState.resetInternalError();
lastException.clear();

DatanodeInfo[] excluded = getExcludedNodes();
lb = locateFollowingBlock(
excluded.length > 0 ? excluded : null, oldBlock);
Expand Down Expand Up @@ -1849,6 +1848,7 @@ boolean createBlockOutputStream(DatanodeInfo[] nodes,
LOG.info("nodes are empty for write pipeline of " + block);
return false;
}

String firstBadLink = "";
boolean checkRestart = false;
if (LOG.isDebugEnabled()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private LocatedBlock getFollowingBlock() throws IOException {
return coordinator.getFollowingBlocks().poll(index);
}


@Override
protected LocatedBlock nextBlockOutputStream() throws IOException {
boolean success;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ class BlockReceiver implements Closeable {
private final AtomicLong lastSentTime = new AtomicLong(0L);
private long maxSendIdleTime;


BlockReceiver(final ExtendedBlock block, final StorageType storageType,
final DataInputStream in,
final String inAddr, final String myAddr,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public boolean isSimulated() {
}
}


/**
* It behaviors as an unmodifiable list of FsVolume. Individual FsVolume can
* be obtained by using {@link #get(int)}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,7 @@ public Replica recoverClose(ExtendedBlock b, long newGS,
}
}


@Override // FsDatasetSpi
public ReplicaHandler createRbw(
StorageType storageType, String storageId, ExtendedBlock b,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ public class TestDistributedFileSystem {
private boolean dualPortTesting = false;

private boolean noXmlDefaults = false;



HdfsConfiguration getTestConfiguration() {
HdfsConfiguration conf;
if (noXmlDefaults) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public SimulatedFSDataset newInstance(DataNode datanode,
return new SimulatedFSDataset(datanode, storage, conf);
}


@Override
public boolean isSimulated() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class ExternalDatasetImpl implements FsDatasetSpi<ExternalVolumeImpl> {
DatanodeStorage.generateUuid(), DatanodeStorage.State.NORMAL,
StorageType.DEFAULT);


@Override
public FsVolumeReferences getFsVolumeReferences() {
return null;
Expand Down
2 changes: 1 addition & 1 deletion hadoop-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@

<!-- Plugin versions and config -->
<maven-surefire-plugin.argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>

Expand Down