HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh.
(cherry picked from commit d9556e873ef4d3e68c4f0c991f856d1faa747f07)
This commit is contained in:
parent
f1feaae1dd
commit
afaadd6535
|
@ -470,6 +470,9 @@ Release 2.6.0 - UNRELEASED
|
|||
HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected
|
||||
by the lock (cmccabe)
|
||||
|
||||
HADOOP-11161. Expose close method in KeyProvider to give clients of
|
||||
Provider implementations a hook to release resources. (Arun Suresh via atm)
|
||||
|
||||
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HADOOP-10734. Implement high-performance secure random number sources.
|
||||
|
|
|
@ -533,6 +533,14 @@ public abstract class KeyProvider {
|
|||
byte[] material
|
||||
) throws IOException;
|
||||
|
||||
/**
|
||||
* Can be used by implementing classes to close any resources
|
||||
* that require closing
|
||||
*/
|
||||
public void close() throws IOException {
|
||||
// NOP
|
||||
}
|
||||
|
||||
/**
|
||||
* Roll a new version of the given key generating the material for it.
|
||||
* <p/>
|
||||
|
|
|
@ -410,4 +410,11 @@ public class KeyProviderCryptoExtension extends
|
|||
return new KeyProviderCryptoExtension(keyProvider, cryptoExtension);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
if (getKeyProvider() != null) {
|
||||
getKeyProvider().close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -791,4 +791,15 @@ public class KMSClientProvider extends KeyProvider implements CryptoExtension,
|
|||
return tokens;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shutdown valueQueue executor threads
|
||||
*/
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
try {
|
||||
encKeyVersionQueue.shutdown();
|
||||
} catch (Exception e) {
|
||||
throw new IOException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -75,6 +75,8 @@ public class ValueQueue <E> {
|
|||
private final int numValues;
|
||||
private final float lowWatermark;
|
||||
|
||||
private volatile boolean executorThreadsStarted = false;
|
||||
|
||||
/**
|
||||
* A <code>Runnable</code> which takes a string name.
|
||||
*/
|
||||
|
@ -187,9 +189,6 @@ public class ValueQueue <E> {
|
|||
TimeUnit.MILLISECONDS, queue, new ThreadFactoryBuilder()
|
||||
.setDaemon(true)
|
||||
.setNameFormat(REFILL_THREAD).build());
|
||||
// To ensure all requests are first queued, make coreThreads = maxThreads
|
||||
// and pre-start all the Core Threads.
|
||||
executor.prestartAllCoreThreads();
|
||||
}
|
||||
|
||||
public ValueQueue(final int numValues, final float lowWaterMark, long expiry,
|
||||
|
@ -297,6 +296,15 @@ public class ValueQueue <E> {
|
|||
|
||||
private void submitRefillTask(final String keyName,
|
||||
final Queue<E> keyQueue) throws InterruptedException {
|
||||
if (!executorThreadsStarted) {
|
||||
synchronized (this) {
|
||||
// To ensure all requests are first queued, make coreThreads =
|
||||
// maxThreads
|
||||
// and pre-start all the Core Threads.
|
||||
executor.prestartAllCoreThreads();
|
||||
executorThreadsStarted = true;
|
||||
}
|
||||
}
|
||||
// The submit/execute method of the ThreadPoolExecutor is bypassed and
|
||||
// the Runnable is directly put in the backing BlockingQueue so that we
|
||||
// can control exactly how the runnable is inserted into the queue.
|
||||
|
|
|
@ -935,12 +935,18 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
|
|||
*/
|
||||
@Override
|
||||
public synchronized void close() throws IOException {
|
||||
if(clientRunning) {
|
||||
closeAllFilesBeingWritten(false);
|
||||
clientRunning = false;
|
||||
getLeaseRenewer().closeClient(this);
|
||||
// close connections to the namenode
|
||||
closeConnectionToNamenode();
|
||||
try {
|
||||
if(clientRunning) {
|
||||
closeAllFilesBeingWritten(false);
|
||||
clientRunning = false;
|
||||
getLeaseRenewer().closeClient(this);
|
||||
// close connections to the namenode
|
||||
closeConnectionToNamenode();
|
||||
}
|
||||
} finally {
|
||||
if (provider != null) {
|
||||
provider.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue