You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/03/18 17:58:07 UTC
svn commit: r1855781 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: reschke
Date: Mon Mar 18 17:58:07 2019
New Revision: 1855781
URL: http://svn.apache.org/viewvc?rev=1855781&view=rev
Log:
OAK-8089: DocumentNodeStore dispose can fail when duration of final background ops exceeds lease time (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentDiscoveryLiteServiceTest.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 18 17:58:07 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854701,1854827,1854848,1854859,1854930,1854990-1854991,1855221,1855477-1855478
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854701,1854773,1854827,1854848,1854859,1854930,1854990-1854991,1855221,1855477-1855478
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1855781&r1=1855780&r2=1855781&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Mon Mar 18 17:58:07 2019
@@ -250,6 +250,11 @@ public final class DocumentNodeStore
private final AtomicBoolean isDisposed = new AtomicBoolean();
/**
+ * Whether the lease update thread shall be stopped.
+ */
+ private final AtomicBoolean stopLeaseUpdateThread = new AtomicBoolean();
+
+ /**
* The cluster instance info.
*/
@NotNull
@@ -559,7 +564,7 @@ public final class DocumentNodeStore
clusterNodeInfo.setLeaseFailureHandler(builder.getLeaseFailureHandler());
}
String threadNamePostfix = "(" + clusterId + ")";
- leaseUpdateThread = new Thread(new BackgroundLeaseUpdate(this, isDisposed),
+ leaseUpdateThread = new Thread(new BackgroundLeaseUpdate(this, stopLeaseUpdateThread),
"DocumentNodeStore lease update thread " + threadNamePostfix);
leaseUpdateThread.setDaemon(true);
if (!readOnlyMode) {
@@ -777,7 +782,17 @@ public final class DocumentNodeStore
}
}
- Utils.joinQuietly(clusterUpdateThread, leaseUpdateThread);
+ Utils.joinQuietly(clusterUpdateThread);
+
+ // Stop lease update thread once no further document store operations
+ // are required
+ LOG.debug("Stopping LeaseUpdate thread...");
+ stopLeaseUpdateThread.set(true);
+ synchronized (stopLeaseUpdateThread) {
+ stopLeaseUpdateThread.notifyAll();
+ }
+ Utils.joinQuietly(leaseUpdateThread);
+ LOG.debug("Stopped LeaseUpdate thread");
// now mark this cluster node as inactive by disposing the
// clusterNodeInfo, but only if final background operations
@@ -785,6 +800,7 @@ public final class DocumentNodeStore
if (ex == null) {
clusterNodeInfo.dispose();
}
+
store.dispose();
if (blobStore instanceof Closeable) {
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentDiscoveryLiteServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentDiscoveryLiteServiceTest.java?rev=1855781&r1=1855780&r2=1855781&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentDiscoveryLiteServiceTest.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BaseDocumentDiscoveryLiteServiceTest.java Mon Mar 18 17:58:07 2019
@@ -317,6 +317,11 @@ public abstract class BaseDocumentDiscov
return isDisposed;
}
+ private AtomicBoolean getStopLeaseUpdateThread() throws NoSuchFieldException {
+ AtomicBoolean stopLeaseUpdateThread = (AtomicBoolean) PrivateAccessor.getField(ns, "stopLeaseUpdateThread");
+ return stopLeaseUpdateThread;
+ }
+
private void stopAllBackgroundThreads() throws NoSuchFieldException {
// get all those background threads...
Thread backgroundReadThread = (Thread) PrivateAccessor.getField(ns, "backgroundReadThread");
@@ -349,6 +354,12 @@ public abstract class BaseDocumentDiscov
} catch (InterruptedException e) {
// ignore
}
+ final AtomicBoolean stopLeaseUpdateThread = getStopLeaseUpdateThread();
+ assertFalse(stopLeaseUpdateThread.getAndSet(true));
+ // notify background threads waiting on stopLeaseUpdateThread
+ synchronized (stopLeaseUpdateThread) {
+ stopLeaseUpdateThread.notifyAll();
+ }
try {
leaseUpdateThread.join(5000);
assertTrue(!leaseUpdateThread.isAlive());