Revert HDFS-6788, bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615239 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang
parent
511234c828
commit
2777f777e9
|
|
@ -97,9 +97,6 @@ Release 2.6.0 - UNRELEASED
|
|||
HDFS-6802. Some tests in TestDFSClientFailover are missing @Test
|
||||
annotation. (Akira Ajisaka via wang)
|
||||
|
||||
HDFS-6788. Improve synchronization in BPOfferService with read write lock.
|
||||
(Yongjun Zhang via wang)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HDFS-6690. Deduplicate xattr names in memory. (wang)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.hadoop.classification.InterfaceAudience;
|
||||
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
|
||||
|
|
@ -39,8 +38,6 @@
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.concurrent.locks.Lock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
/**
|
||||
* One instance per block-pool/namespace on the DN, which handles the
|
||||
|
|
@ -94,28 +91,6 @@ class BPOfferService {
|
|||
*/
|
||||
private long lastActiveClaimTxId = -1;
|
||||
|
||||
private final ReentrantReadWriteLock mReadWriteLock =
|
||||
new ReentrantReadWriteLock();
|
||||
private final Lock mReadLock = mReadWriteLock.readLock();
|
||||
private final Lock mWriteLock = mReadWriteLock.writeLock();
|
||||
|
||||
// utility methods to acquire and release read lock and write lock
|
||||
void readLock() {
|
||||
mReadLock.lock();
|
||||
}
|
||||
|
||||
void readUnlock() {
|
||||
mReadLock.unlock();
|
||||
}
|
||||
|
||||
void writeLock() {
|
||||
mWriteLock.lock();
|
||||
}
|
||||
|
||||
void writeUnlock() {
|
||||
mWriteLock.unlock();
|
||||
}
|
||||
|
||||
BPOfferService(List<InetSocketAddress> nnAddrs, DataNode dn) {
|
||||
Preconditions.checkArgument(!nnAddrs.isEmpty(),
|
||||
"Must pass at least one NN.");
|
||||
|
|
@ -161,9 +136,7 @@ boolean isAlive() {
|
|||
return false;
|
||||
}
|
||||
|
||||
String getBlockPoolId() {
|
||||
readLock();
|
||||
try {
|
||||
synchronized String getBlockPoolId() {
|
||||
if (bpNSInfo != null) {
|
||||
return bpNSInfo.getBlockPoolID();
|
||||
} else {
|
||||
|
|
@ -171,28 +144,18 @@ String getBlockPoolId() {
|
|||
new Exception("trace"));
|
||||
return null;
|
||||
}
|
||||
} finally {
|
||||
readUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
boolean hasBlockPoolId() {
|
||||
return getNamespaceInfo() != null;
|
||||
}
|
||||
|
||||
NamespaceInfo getNamespaceInfo() {
|
||||
readLock();
|
||||
try {
|
||||
synchronized NamespaceInfo getNamespaceInfo() {
|
||||
return bpNSInfo;
|
||||
} finally {
|
||||
readUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
readLock();
|
||||
try {
|
||||
public synchronized String toString() {
|
||||
if (bpNSInfo == null) {
|
||||
// If we haven't yet connected to our NN, we don't yet know our
|
||||
// own block pool ID.
|
||||
|
|
@ -209,9 +172,6 @@ public String toString() {
|
|||
" (Datanode Uuid " + dn.getDatanodeUuid() +
|
||||
")";
|
||||
}
|
||||
} finally {
|
||||
readUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
void reportBadBlocks(ExtendedBlock block,
|
||||
|
|
@ -306,9 +266,7 @@ DataNode getDataNode() {
|
|||
* verifies that this namespace matches (eg to prevent a misconfiguration
|
||||
* where a StandbyNode from a different cluster is specified)
|
||||
*/
|
||||
void verifyAndSetNamespaceInfo(NamespaceInfo nsInfo) throws IOException {
|
||||
writeLock();
|
||||
try {
|
||||
synchronized void verifyAndSetNamespaceInfo(NamespaceInfo nsInfo) throws IOException {
|
||||
if (this.bpNSInfo == null) {
|
||||
this.bpNSInfo = nsInfo;
|
||||
boolean success = false;
|
||||
|
|
@ -335,9 +293,6 @@ void verifyAndSetNamespaceInfo(NamespaceInfo nsInfo) throws IOException {
|
|||
checkNSEquality(bpNSInfo.getClusterID(), nsInfo.getClusterID(),
|
||||
"Cluster ID");
|
||||
}
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -345,10 +300,8 @@ void verifyAndSetNamespaceInfo(NamespaceInfo nsInfo) throws IOException {
|
|||
* NN, it calls this function to verify that the NN it connected to
|
||||
* is consistent with other NNs serving the block-pool.
|
||||
*/
|
||||
void registrationSucceeded(BPServiceActor bpServiceActor,
|
||||
synchronized void registrationSucceeded(BPServiceActor bpServiceActor,
|
||||
DatanodeRegistration reg) throws IOException {
|
||||
writeLock();
|
||||
try {
|
||||
if (bpRegistration != null) {
|
||||
checkNSEquality(bpRegistration.getStorageInfo().getNamespaceID(),
|
||||
reg.getStorageInfo().getNamespaceID(), "namespace ID");
|
||||
|
|
@ -364,9 +317,6 @@ void registrationSucceeded(BPServiceActor bpServiceActor,
|
|||
dn.blockPoolTokenSecretManager.addKeys(getBlockPoolId(),
|
||||
reg.getExportedKeys());
|
||||
}
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -383,24 +333,17 @@ private static void checkNSEquality(
|
|||
}
|
||||
}
|
||||
|
||||
DatanodeRegistration createRegistration() {
|
||||
writeLock();
|
||||
try {
|
||||
synchronized DatanodeRegistration createRegistration() {
|
||||
Preconditions.checkState(bpNSInfo != null,
|
||||
"getRegistration() can only be called after initial handshake");
|
||||
return dn.createBPRegistration(bpNSInfo);
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when an actor shuts down. If this is the last actor
|
||||
* to shut down, shuts down the whole blockpool in the DN.
|
||||
*/
|
||||
void shutdownActor(BPServiceActor actor) {
|
||||
writeLock();
|
||||
try {
|
||||
synchronized void shutdownActor(BPServiceActor actor) {
|
||||
if (bpServiceToActive == actor) {
|
||||
bpServiceToActive = null;
|
||||
}
|
||||
|
|
@ -410,9 +353,6 @@ void shutdownActor(BPServiceActor actor) {
|
|||
if (bpServices.isEmpty()) {
|
||||
dn.shutdownBlockPool(this);
|
||||
}
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -453,17 +393,12 @@ void reportRemoteBadBlock(DatanodeInfo dnInfo, ExtendedBlock block) {
|
|||
* @return a proxy to the active NN, or null if the BPOS has not
|
||||
* acknowledged any NN as active yet.
|
||||
*/
|
||||
DatanodeProtocolClientSideTranslatorPB getActiveNN() {
|
||||
readLock();
|
||||
try {
|
||||
synchronized DatanodeProtocolClientSideTranslatorPB getActiveNN() {
|
||||
if (bpServiceToActive != null) {
|
||||
return bpServiceToActive.bpNamenode;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
} finally {
|
||||
readUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
|
@ -490,11 +425,9 @@ void signalRollingUpgrade(boolean inProgress) {
|
|||
* @param actor the actor which received the heartbeat
|
||||
* @param nnHaState the HA-related heartbeat contents
|
||||
*/
|
||||
void updateActorStatesFromHeartbeat(
|
||||
synchronized void updateActorStatesFromHeartbeat(
|
||||
BPServiceActor actor,
|
||||
NNHAStatusHeartbeat nnHaState) {
|
||||
writeLock();
|
||||
try {
|
||||
final long txid = nnHaState.getTxId();
|
||||
|
||||
final boolean nnClaimsActive =
|
||||
|
|
@ -532,9 +465,6 @@ void updateActorStatesFromHeartbeat(
|
|||
assert txid >= lastActiveClaimTxId;
|
||||
lastActiveClaimTxId = txid;
|
||||
}
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -604,14 +534,11 @@ boolean processCommandFromActor(DatanodeCommand cmd,
|
|||
actor.reRegister();
|
||||
return true;
|
||||
}
|
||||
writeLock();
|
||||
try {
|
||||
synchronized (this) {
|
||||
if (actor == bpServiceToActive) {
|
||||
return processCommandFromActive(cmd, actor);
|
||||
} else {
|
||||
return processCommandFromStandby(cmd, actor);
|
||||
} finally {
|
||||
writeUnlock();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue