|
@@ -176,7 +176,6 @@ import java.util.TreeMap;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.Executors;
|
|
import java.util.concurrent.Executors;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
-import java.util.concurrent.locks.Condition;
|
|
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
import java.util.function.Supplier;
|
|
import java.util.function.Supplier;
|
|
@@ -662,7 +661,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
|
|
private KeyProviderCryptoExtension provider = null;
|
|
private KeyProviderCryptoExtension provider = null;
|
|
|
|
|
|
private volatile boolean imageLoaded = false;
|
|
private volatile boolean imageLoaded = false;
|
|
- private final Condition cond;
|
|
|
|
|
|
|
|
private final FSImage fsImage;
|
|
private final FSImage fsImage;
|
|
|
|
|
|
@@ -704,7 +702,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
|
|
try {
|
|
try {
|
|
setImageLoaded(true);
|
|
setImageLoaded(true);
|
|
dir.markNameCacheInitialized();
|
|
dir.markNameCacheInitialized();
|
|
- cond.signalAll();
|
|
|
|
} finally {
|
|
} finally {
|
|
writeUnlock("setImageLoaded");
|
|
writeUnlock("setImageLoaded");
|
|
}
|
|
}
|
|
@@ -875,7 +872,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
|
|
conf.get(HADOOP_CALLER_CONTEXT_SEPARATOR_KEY,
|
|
conf.get(HADOOP_CALLER_CONTEXT_SEPARATOR_KEY,
|
|
HADOOP_CALLER_CONTEXT_SEPARATOR_DEFAULT);
|
|
HADOOP_CALLER_CONTEXT_SEPARATOR_DEFAULT);
|
|
fsLock = new FSNamesystemLock(conf, detailedLockHoldTimeMetrics);
|
|
fsLock = new FSNamesystemLock(conf, detailedLockHoldTimeMetrics);
|
|
- cond = fsLock.newWriteLockCondition();
|
|
|
|
cpLock = new ReentrantLock();
|
|
cpLock = new ReentrantLock();
|
|
|
|
|
|
this.fsImage = fsImage;
|
|
this.fsImage = fsImage;
|