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 mr...@apache.org on 2019/09/05 11:00:25 UTC
svn commit: r1866449 - in /jackrabbit/oak/branches/1.8: ./
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: mreutegg
Date: Thu Sep 5 11:00:24 2019
New Revision: 1866449
URL: http://svn.apache.org/viewvc?rev=1866449&view=rev
Log:
OAK-8449: LastRev check/fix in DocumentNodeStore MBean
Merge revision 1862746 from trunk
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 5 11:00:24 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1823671,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019
,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845
415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853435,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854579-1854580,1854596,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1
859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861114,1861626,1861743,1861757,1861763,1861770,1861776,1861780,1862044,1862266,1862370,1862422,1862447-1862448,1862465,1862499,1862536-1862537,1862728,1862806,1862817,1862881,1862926-1862927,1862977,1863076,1863081,1863086,1863369,1863405,1863540,1863633-1863634,1863645,1864349,1864353,1865752
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1823671,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019
,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845
415,1845730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853435,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854579-1854580,1854596,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1
859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861114,1861626,1861743,1861757,1861763,1861770,1861776,1861780,1862044,1862266,1862370,1862422,1862447-1862448,1862465,1862499,1862536-1862537,1862728,1862746,1862806,1862817,1862881,1862926-1862927,1862977,1863076,1863081,1863086,1863369,1863405,1863540,1863633-1863634,1863645,1864349,1864353,1865752
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1866449&r1=1866448&r2=1866449&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Sep 5 11:00:24 2019
@@ -3381,4 +3381,8 @@ public final class DocumentNodeStore
int getUpdateLimit() {
return updateLimit;
}
+
+ boolean isReadOnlyMode() {
+ return readOnlyMode;
+ }
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java?rev=1866449&r1=1866448&r2=1866449&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBean.java Thu Sep 5 11:00:24 2019
@@ -64,4 +64,16 @@ public interface DocumentNodeStoreMBean
CompositeData getBranchCommitHistory();
CompositeData getMergeBranchCommitHistory();
+
+ @Description("Triggers last revision recovery of nodes, below a given path and clusterId.\n" +
+ "Returns number of records updated after performing recovery.\n" +
+ "Note: Recovery can only be performed on inactive clusterIds. If the clusterNode is in ReadOnly mode,\n" +
+ "it will return the no. of documents which needs update and won't perform recovery")
+ int recover(
+ @Description("The absolute path of a node.")
+ @Name("path")
+ String path,
+ @Description("The id of an inactive cluster node.")
+ @Name("clusterId")
+ int clusterId);
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java?rev=1866449&r1=1866448&r2=1866449&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java Thu Sep 5 11:00:24 2019
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import java.text.SimpleDateFormat;
+import java.util.List;
import java.util.TimeZone;
import javax.management.NotCompliantMBeanException;
@@ -27,9 +28,15 @@ import com.google.common.base.Predicate;
import org.apache.jackrabbit.api.stats.RepositoryStatistics;
import org.apache.jackrabbit.api.stats.TimeSeries;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
+import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.stats.TimeSeriesStatsUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.toArray;
import static com.google.common.collect.Iterables.transform;
@@ -45,6 +52,7 @@ final class DocumentNodeStoreMBeanImpl e
private final DocumentNodeStore nodeStore;
private final RepositoryStatistics repoStats;
private final Iterable<ClusterNodeInfoDocument> clusterNodes;
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
DocumentNodeStoreMBeanImpl(DocumentNodeStore nodeStore,
RepositoryStatistics repoStats,
@@ -184,4 +192,50 @@ final class DocumentNodeStoreMBeanImpl e
private TimeSeries getTimeSeries(String name) {
return repoStats.getTimeSeries(name, true);
}
+
+ @Override
+ public int recover(String path, int clusterId) {
+ checkNotNull(path, "path must not be null");
+ checkArgument(PathUtils.isAbsolute(path), "path must be absolute");
+ checkArgument(clusterId >= 0, "clusterId must not be a negative");
+
+ DocumentStore docStore = nodeStore.getDocumentStore();
+ boolean isActive = false;
+
+ for (ClusterNodeInfoDocument it : ClusterNodeInfoDocument.all(docStore)) {
+ if (it.getClusterId() == clusterId && it.isActive()) {
+ isActive = true;
+ }
+ }
+
+ if (isActive) {
+ throw new IllegalStateException(
+ "Cannot run recover on clusterId " + clusterId + " as it's currently active");
+ }
+
+ String p = path;
+ NodeDocument nodeDocument = docStore.find(Collection.NODES, Utils.getIdFromPath(p));
+ if(nodeDocument == null) {
+ throw new DocumentStoreException("Document node with given path = " + p + " does not exist");
+ }
+
+ boolean dryRun = nodeStore.isReadOnlyMode();
+ int sum = 0;
+ for (;;) {
+ log.info("Running recovery on child documents of path = " + p);
+ List<NodeDocument> childDocs = getChildDocs(p);
+ sum += nodeStore.getLastRevRecoveryAgent().recover(childDocs, clusterId, dryRun);
+ if (PathUtils.denotesRoot(p)) {
+ break;
+ }
+ p = PathUtils.getParentPath(p);
+ }
+ return sum;
+ }
+
+ private List<NodeDocument> getChildDocs(String path) {
+ final String to = Utils.getKeyUpperLimit(path);
+ final String from = Utils.getKeyLowerLimit(path);
+ return nodeStore.getDocumentStore().query(Collection.NODES, from, to, 10000);
+ }
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1866449&r1=1866448&r2=1866449&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Thu Sep 5 11:00:24 2019
@@ -679,6 +679,71 @@ public class DocumentNodeStoreTest {
assertTrue(active[0].startsWith(cId2 + "="));
}
+ //OAK-8449
+ @Test
+ public void lastRevisionRecovery() throws Exception {
+ DocumentStore docStore = new MemoryDocumentStore();
+ DocumentNodeStore ns1 = builderProvider.newBuilder().setAsyncDelay(0)
+ .setClusterId(1).setDocumentStore(docStore)
+ .getNodeStore();
+ int cId1 = ns1.getClusterId();
+ NodeBuilder builder = ns1.getRoot().builder();
+
+ //Validating null path
+ try {
+ ns1.getMBean().recover(null, cId1);
+ fail("must fail with NullPointerException");
+ } catch (NullPointerException expected) {}
+
+ //Validating empty path
+ try {
+ ns1.getMBean().recover("", cId1);
+ fail("must fail with IllegalArgumentException");
+ } catch (IllegalArgumentException expected) {}
+
+ //Validating negative clusterId
+ try {
+ ns1.getMBean().recover("/foo", -1);
+ fail("must fail with IllegalArgumentException");
+ } catch (IllegalArgumentException expected) {}
+
+ //Validating recovery on active node
+ try {
+ ns1.getMBean().recover("/foo", cId1);
+ fail("must fail with IllegalStateException");
+ } catch (IllegalStateException expected) {}
+
+ builder.child("foo").child("bar");
+ merge(ns1, builder);
+
+ builder = ns1.getRoot().builder();
+ builder.child("foo").child("bar").setProperty("key", "value");
+ merge(ns1, builder);
+ ns1.dispose();
+
+ UpdateOp op = new UpdateOp(Utils.getIdFromPath("/foo"), false);
+ op.removeMapEntry("_lastRev", new Revision(0, 0, cId1));
+ assertNotNull(docStore.findAndUpdate(Collection.NODES, op));
+
+ //Validate no. of affected paths in readOnlyMode
+ DocumentNodeStore ns2 = builderProvider.newBuilder().setAsyncDelay(0)
+ .setClusterId(2).setDocumentStore(docStore).setReadOnlyMode()
+ .getNodeStore();
+ assertEquals(1, ns2.getMBean().recover("/foo", cId1));
+
+ //Validate no. of recovered paths
+ DocumentNodeStore ns3 = builderProvider.newBuilder().setAsyncDelay(0)
+ .setClusterId(3).setDocumentStore(docStore)
+ .getNodeStore();
+ assertEquals(1, ns3.getMBean().recover("/foo", cId1));
+
+ //Validating recovery on non existing path
+ try {
+ ns2.getMBean().recover("/foo1", cId1);
+ fail("must fail with DocumentStoreException");
+ } catch (DocumentStoreException expected) {}
+ }
+
// OAK-2288
@Test
public void mergedBranchVisibility() throws Exception {