svn commit: r1748443 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: SegmentNodeStore.java file/FileStoreBuilder.java

[md...@apache.org]

Author: mduerig
Date: Tue Jun 14 16:44:55 2016
New Revision: 1748443

URL: http://svn.apache.org/viewvc?rev=1748443&view=rev
Log:
OAK-4449: SegmentNodeStore and SegmentStore builders should log their parameters on build()
log parameters used to create instances of FileStore and SegmentNodeStore at info level

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java?rev=1748443&r1=1748442&r2=1748443&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java Tue Jun 14 16:44:55 2016
@@ -73,6 +73,7 @@ import org.slf4j.LoggerFactory;
 public class SegmentNodeStore implements NodeStore, Observable {
 
     public static class SegmentNodeStoreBuilder {
+        private static final Logger LOG = LoggerFactory.getLogger(SegmentNodeStoreBuilder.class);
 
         @Nonnull
         private final Revisions revisions;
@@ -103,8 +104,21 @@ public class SegmentNodeStore implements
         public SegmentNodeStore build() {
             checkState(!isCreated);
             isCreated = true;
+            LOG.info("Creating segment node store {}", this);
             return new SegmentNodeStore(this);
         }
+
+        @Nonnull
+        private static String getString(@CheckForNull BlobStore blobStore) {
+            return "blobStore=" + (blobStore == null ? "inline" : blobStore);
+        }
+
+        @Override
+        public String toString() {
+            return "SegmentNodeStoreBuilder{" +
+                    getString(blobStore) +
+                    '}';
+        }
     }
 
     @Nonnull

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1748443&r1=1748442&r2=1748443&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java Tue Jun 14 16:44:55 2016
@@ -45,7 +45,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Builder for creating {@link FileStore} instances.
  */
-// FIXME OAK-4449: SegmentNodeStore and SegmentStore builders should log their parameters on build()
 public class FileStoreBuilder {
     private static final Logger LOG = LoggerFactory.getLogger(FileStore.class);
 
@@ -272,6 +271,7 @@ public class FileStoreBuilder {
     public FileStore build() throws IOException {
         directory.mkdir();
         revisions = new TarRevisions(false, directory);
+        LOG.info("Creating file store {}", this);
         return new FileStore(this, false).bind(revisions);
     }
 
@@ -296,6 +296,7 @@ public class FileStoreBuilder {
     public ReadOnlyStore buildReadOnly() throws IOException {
         checkState(directory.exists() && directory.isDirectory());
         revisions = new TarRevisions(true, directory);
+        LOG.info("Creating file store {}", this);
         return new ReadOnlyStore(this).bind(revisions);
     }
 
@@ -346,4 +347,16 @@ public class FileStoreBuilder {
     WriterCacheManager getCacheManager() {
         return cacheManager;
     }
+
+    @Override
+    public String toString() {
+        return "FileStoreBuilder{" +
+                "directory=" + directory +
+                ", blobStore=" + blobStore +
+                ", maxFileSize=" + maxFileSize +
+                ", cacheSize=" + cacheSize +
+                ", memoryMapping=" + memoryMapping +
+                ", gcOptions=" + gcOptions +
+                '}';
+    }
 }