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 ad...@apache.org on 2016/12/22 08:46:16 UTC
svn commit: r1775591 - in /jackrabbit/oak/trunk:
oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/
oak-it/src/test/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/sr...
Author: adulceanu
Date: Thu Dec 22 08:46:16 2016
New Revision: 1775591
URL: http://svn.apache.org/viewvc?rev=1775591&view=rev
Log:
Squashed commit of the following:
commit 09d7bef3aadcb8166ee2e6f83a15f2bcb9392033
Merge: b9c4dab 07222e2
Author: Andrei Dulceanu <du...@adobe.com>
Date: Thu Dec 22 10:44:08 2016 +0200
Merge branch 'upstream-trunk' into issues/OAK-5335
commit b9c4dab809d67c161fb320e4e896d0bda4d0dd99
Author: Andrei Dulceanu <du...@adobe.com>
Date: Thu Dec 22 10:41:34 2016 +0200
OAK-5335 - Clarify the various directories and their usages in SegmentNodeStoreService
Corrected description for REPOSITORY_HOME_DIRECTORY
commit 73c75988c6dae34a3748f161d69fa54e292851ee
Merge: f5caf65 4aee212
Author: Andrei Dulceanu <du...@adobe.com>
Date: Wed Dec 21 16:14:26 2016 +0200
Merge branch 'upstream-trunk' into issues/OAK-5335
commit f5caf654bd8a77be4297ff23b616919a9a04b4cb
Author: Andrei Dulceanu <du...@adobe.com>
Date: Wed Dec 21 16:13:20 2016 +0200
OAK-5335 - Clarify the various directories and there usages in SegmentNodeStoreService
Corrected mis-usage of SegmentNodeStoreService.DIRECTORY in oak-it tests related to oak-segment
Renamed getRootDirectory() to getRepositoryHome(); renamed DIRECTORY to REPOSITORY_HOME_DIRECTORY and updated description
Added JavaDoc
commit 6d28083d24c749071fd2e5e904233d9333b4334c
Merge: 3e3cc61 a099521
Author: Andrei Dulceanu <du...@adobe.com>
Date: Tue Dec 20 15:57:30 2016 +0200
Merge branch 'upstream-trunk' into issues/OAK-5335
commit 3e3cc61d83b2fc0111497eb6f559f21f69078c62
Author: Andrei Dulceanu <du...@adobe.com>
Date: Tue Dec 20 15:32:01 2016 +0200
OAK-5335 - Clarify the various directories and there usages in SegmentNodeStoreService
Removed getBaseDirectory(), renamed getDirectory() to getSegmentDirectory() and consistently used getRootDirectory() in SegmentNodeStoreService
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCachingDataStoreStatsTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreStatsTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobTrackerRegistrationTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCachingDataStoreStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCachingDataStoreStatsTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCachingDataStoreStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCachingDataStoreStatsTest.java Thu Dec 22 08:46:16 2016
@@ -38,7 +38,7 @@ import org.osgi.framework.ServiceRegistr
import static com.google.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
-import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DIRECTORY;
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreStatsTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentS3DataStoreStatsTest.java Thu Dec 22 08:46:16 2016
@@ -38,7 +38,7 @@ import org.osgi.framework.ServiceRegistr
import static com.google.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
-import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DIRECTORY;
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java Thu Dec 22 08:46:16 2016
@@ -39,7 +39,7 @@ import org.osgi.framework.ServiceRegistr
import static com.google.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
-import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DIRECTORY;
+import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -110,7 +110,7 @@ public class SegmentCachingDataStoreStat
Map<String, Object> properties = newHashMap();
properties.put(CUSTOM_BLOB_STORE, customBlobStore);
- properties.put(DIRECTORY, folder.getRoot().getAbsolutePath());
+ properties.put(REPOSITORY_HOME_DIRECTORY, folder.getRoot().getAbsolutePath());
segmentNodeStoreService =
context.registerInjectActivateService(new SegmentNodeStoreService(), properties);
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java Thu Dec 22 08:46:16 2016
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segmen
import static com.google.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
-import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DIRECTORY;
+import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -108,7 +108,7 @@ public class SegmentS3DataStoreStatsTest
Map<String, Object> properties = newHashMap();
properties.put(CUSTOM_BLOB_STORE, customBlobStore);
- properties.put(DIRECTORY, folder.getRoot().getAbsolutePath());
+ properties.put(REPOSITORY_HOME_DIRECTORY, folder.getRoot().getAbsolutePath());
segmentNodeStoreService = context.registerInjectActivateService(new SegmentNodeStoreService(), properties);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java Thu Dec 22 08:46:16 2016
@@ -38,7 +38,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DEFAULT_BLOB_GC_MAX_AGE;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DEFAULT_BLOB_SNAPSHOT_INTERVAL;
-import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.DIRECTORY;
+import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.GC_PROGRESS_LOG;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.MEMORY_THRESHOLD;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.MODE;
@@ -155,11 +155,12 @@ public class SegmentNodeStoreService {
private static final Logger log = LoggerFactory.getLogger(SegmentNodeStoreService.class);
@Property(
- label = "Directory",
- description = "Directory for storing the tar files. Defaults to the value of the framework " +
- "property 'repository.home' or to 'repository' if that is neither specified."
+ label = "Repository Home Directory",
+ description = "Path on the file system where repository data will be stored. "
+ + "Defaults to the value of the framework property 'repository.home' or to 'repository' "
+ + "if that is neither specified."
)
- public static final String DIRECTORY = "repository.home";
+ public static final String REPOSITORY_HOME_DIRECTORY = "repository.home";
@Property(
label = "Mode",
@@ -438,7 +439,7 @@ public class SegmentNodeStoreService {
.withGCNodeWriteMonitor(configuration.getGCProcessLog());
// Build the FileStore
- FileStoreBuilder builder = fileStoreBuilder(configuration.getDirectory())
+ FileStoreBuilder builder = fileStoreBuilder(configuration.getSegmentDirectory())
.withSegmentCacheSize(configuration.getSegmentCacheSize())
.withStringCacheSize(configuration.getStringCacheSize())
.withTemplateCacheSize(configuration.getTemplateCacheSize())
@@ -632,7 +633,7 @@ public class SegmentNodeStoreService {
if (trackingStore.getTracker() != null) {
trackingStore.getTracker().close();
}
- trackingStore.addTracker(new BlobIdTracker(configuration.getRootDirectory(), getOrCreateId(segmentNodeStore), configuration.getBlobSnapshotInterval(), sharedDataStore));
+ trackingStore.addTracker(new BlobIdTracker(configuration.getRepositoryHome(), getOrCreateId(segmentNodeStore), configuration.getBlobSnapshotInterval(), sharedDataStore));
}
}
@@ -793,24 +794,42 @@ class Configuration {
return lookupConfigurationThenFramework(context, name);
}
- String getRootDirectory() {
- String root = property(DIRECTORY);
+ /**
+ * Chooses repository home directory name based on <b>repository.home</b>
+ * property, defaulting to <b>repository</b> if property is not set.
+ *
+ * @return repository home directory name.
+ */
+ String getRepositoryHome() {
+ String root = property(REPOSITORY_HOME_DIRECTORY);
if (isNullOrEmpty(root)) {
return "repository";
}
return root;
}
- File getDirectory() {
- return new File(getBaseDirectory(), appendRole("segmentstore"));
+ /**
+ * Creates a new sub-directory relative to {@link #getRepositoryHome()} for
+ * storing segments.
+ *
+ * @return directory for storing segments.
+ */
+ File getSegmentDirectory() {
+ return new File(getRepositoryHome(), appendRole("segmentstore"));
}
+ /**
+ * Creates a new sub-directory relative to {@link #getRepositoryHome()} for
+ * storing repository backups.
+ *
+ * @return directory for storing repository backups.
+ */
File getBackupDirectory() {
String backupDirectory = property(BACKUP_DIRECTORY);
if (backupDirectory != null) {
return new File(backupDirectory);
}
- return new File(getBaseDirectory(), appendRole("segmentstore-backup"));
+ return new File(getRepositoryHome(), appendRole("segmentstore-backup"));
}
int getSegmentCacheSize() {
@@ -917,14 +936,6 @@ class Configuration {
}
}
- private File getBaseDirectory() {
- String directory = property(DIRECTORY);
- if (directory != null) {
- return new File(directory);
- }
- return new File("tarmk");
- }
-
private String getCacheSize(String propertyName) {
String cacheSize = property(propertyName);
if (cacheSize != null) {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobTrackerRegistrationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobTrackerRegistrationTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobTrackerRegistrationTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBlobTrackerRegistrationTest.java Thu Dec 22 08:46:16 2016
@@ -40,7 +40,7 @@ public class SegmentBlobTrackerRegistrat
protected void registerNodeStoreService() {
Map<String, Object> properties = newHashMap();
properties.put(SegmentNodeStoreService.CUSTOM_BLOB_STORE, true);
- properties.put(SegmentNodeStoreService.DIRECTORY, repoHome);
+ properties.put(SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY, repoHome);
service = context.registerInjectActivateService(new SegmentNodeStoreService(), properties);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java Thu Dec 22 08:46:16 2016
@@ -44,7 +44,7 @@ public class SegmentNodeStoreFactoryTest
properties.put(SegmentNodeStoreFactory.ROLE, "some-role");
properties.put(SegmentNodeStoreFactory.CUSTOM_BLOB_STORE, customBlobStore);
- properties.put(SegmentNodeStoreService.DIRECTORY, folder.getRoot().getAbsolutePath());
+ properties.put(SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY, folder.getRoot().getAbsolutePath());
segmentNodeStoreFactory = context.registerInjectActivateService(new SegmentNodeStoreFactory(), properties);
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java?rev=1775591&r1=1775590&r2=1775591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java Thu Dec 22 08:46:16 2016
@@ -146,7 +146,7 @@ public class SegmentNodeStoreServiceTest
Map<String, Object> properties = newHashMap();
properties.put(SegmentNodeStoreService.CUSTOM_BLOB_STORE, customBlobStore);
- properties.put(SegmentNodeStoreService.DIRECTORY, folder.getRoot().getAbsolutePath());
+ properties.put(SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY, folder.getRoot().getAbsolutePath());
segmentNodeStoreService = context.registerInjectActivateService(new SegmentNodeStoreService(), properties);
}