Author: shashank
Date: Wed Feb 3 11:59:42 2016
New Revision: 1728300
URL: http://svn.apache.org/viewvc?rev=1728300&view=rev
Log:
OAK-3253 Support caching in FileDataStoreService
Disabled asyncUpload by default. added log statements
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java?rev=1728300&r1=1728299&r2=1728300&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
Wed Feb 3 11:59:42 2016
@@ -26,6 +26,8 @@ import org.apache.jackrabbit.core.data.C
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jcr.RepositoryException;
import java.util.Map;
@@ -40,6 +42,8 @@ public class FileDataStoreService extend
public static final String FS_BACKEND_PATH = "fsBackendPath";
public static final String PATH = "path";
+ private Logger log = LoggerFactory.getLogger(getClass());
+
@Override
protected DataStore createDataStore(ComponentContext context, Map<String,
Object> config) {
@@ -50,6 +54,8 @@ public class FileDataStoreService extend
Preconditions.checkNotNull(fsBackendPath, "Cannot create " +
"FileDataStoreService with caching. [{path}] property not
configured.");
CachingFDS dataStore = new CachingFDS();
+ // Disabling asyncUpload by default
+
dataStore.setAsyncUploadLimit(PropertiesUtil.toInteger(config.get("asyncUploadLimit"),
0));
config.remove(PATH);
config.remove(CACHE_SIZE);
config.put(FS_BACKEND_PATH, fsBackendPath);
@@ -62,8 +68,10 @@ public class FileDataStoreService extend
Properties properties = new Properties();
properties.putAll(config);
dataStore.setProperties(properties);
+ log.info("CachingFDS initialized with properties " + properties);
return dataStore;
} else {
+ log.info("OakFileDataStore initialized");
return new OakFileDataStore();
}
}