Author: reschke
Date: Mon Jan 9 11:02:28 2017
New Revision: 1777953
URL: http://svn.apache.org/viewvc?rev=1777953&view=rev
Log:
OAK-5098: improve DocumentNodeStoreService robustness for RDB configurations
(ported to 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 9 11:02:28 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767265,1767704,1768446,1768637,1769078,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772228,1772593,1772768,1774497,1775474,1775622,1775628,1775757
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767265,1767704,1768446,1768637,1769078,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772228,1772593,1772768,1774497,1775474,1775622,1775628,1775757
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1777953&r1=1777952&r2=1777953&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Mon Jan 9 11:02:28 2017
@@ -565,28 +565,47 @@ public class DocumentNodeStoreService {
@SuppressWarnings("UnusedDeclaration")
protected void bindDataSource(DataSource dataSource) throws IOException {
- log.info("Initializing DocumentNodeStore with dataSource [{}]",
dataSource);
- this.dataSource = dataSource;
- registerNodeStoreIfPossible();
+ if (this.dataSource != null) {
+ log.info("Ignoring bindDataSource [{}] because dataSource [{}] is
already bound", dataSource, this.dataSource);
+ } else {
+ log.info("Initializing DocumentNodeStore with dataSource [{}]",
dataSource);
+ this.dataSource = dataSource;
+ registerNodeStoreIfPossible();
+ }
}
@SuppressWarnings("UnusedDeclaration")
protected void unbindDataSource(DataSource dataSource) {
- this.dataSource = null;
- unregisterNodeStore();
+ if (this.dataSource != dataSource) {
+ log.info("Ignoring unbindDataSource [{}] because dataSource is
bound to [{}]", dataSource, this.dataSource);
+ } else {
+ log.info("Unregistering DocumentNodeStore because dataSource [{}]
was unbound", dataSource);
+ this.dataSource = null;
+ unregisterNodeStore();
+ }
}
@SuppressWarnings("UnusedDeclaration")
protected void bindBlobDataSource(DataSource dataSource) throws
IOException {
- log.info("Initializing DocumentNodeStore with blobDataSource [{}]",
dataSource);
- this.blobDataSource = dataSource;
- registerNodeStoreIfPossible();
+ if (this.blobDataSource != null) {
+ log.info("Ignoring bindBlobDataSource [{}] because blobDataSource
[{}] is already bound", dataSource,
+ this.blobDataSource);
+ } else {
+ log.info("Initializing DocumentNodeStore with blobDataSource
[{}]", dataSource);
+ this.blobDataSource = dataSource;
+ registerNodeStoreIfPossible();
+ }
}
@SuppressWarnings("UnusedDeclaration")
protected void unbindBlobDataSource(DataSource dataSource) {
- this.blobDataSource = null;
- unregisterNodeStore();
+ if (this.blobDataSource != dataSource) {
+ log.info("Ignoring unbindBlobDataSource [{}] because dataSource is
bound to [{}]", dataSource, this.blobDataSource);
+ } else {
+ log.info("Unregistering DocumentNodeStore because blobDataSource
[{}] was unbound", dataSource);
+ this.blobDataSource = null;
+ unregisterNodeStore();
+ }
}
private void unregisterNodeStore() {
Modified:
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1777953&r1=1777952&r2=1777953&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/branches/1.4/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Mon Jan 9 11:02:28 2017
@@ -79,6 +79,36 @@ class DocumentNodeStoreConfigTest extend
}
@Test
+ public void testRDBDocumentStore2Datasources() throws Exception {
+ // see https://issues.apache.org/jira/browse/OAK-5098
+ registry = repositoryFactory.initializeServiceRegistry(config)
+
+ //1. Register the DataSource as a service
+ DataSource ds = createDS("jdbc:h2:mem:testRDB;DB_CLOSE_DELAY=-1")
+ ServiceRegistration fds =
registry.registerService(DataSource.class.name, ds, ['datasource.name': 'oak']
as Hashtable)
+
+ //2. Register another DataSource as a service with the same name
+ DataSource ds2 = createDS("jdbc:h2:mem:testRDB;DB_CLOSE_DELAY=-1")
+ registry.registerService(DataSource.class.name, ds2,
['datasource.name': 'oak'] as Hashtable)
+
+ //3. Create config for DocumentNodeStore with RDB enabled
+ createConfig([
+
'org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService': [
+ documentStoreType: 'RDB'
+ ]
+ ])
+
+ DocumentNodeStore ns = getServiceWithWait(NodeStore.class)
+
+ //4. unregister first DS
+ fds.unregister()
+
+ //5. check that nodestore is gone
+ TimeUnit.MILLISECONDS.sleep(500)
+ assertNoService(NodeStore.class)
+ }
+
+ @Test
public void testRDBDocumentStoreRestart() throws Exception {
registry = repositoryFactory.initializeServiceRegistry(config)
