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 md...@apache.org on 2018/07/03 16:14:46 UTC
svn commit: r1834999 - in /jackrabbit/oak/trunk:
oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segm...
Author: mduerig
Date: Tue Jul 3 16:14:45 2018
New Revision: 1834999
URL: http://svn.apache.org/viewvc?rev=1834999&view=rev
Log:
OAK-7604: Add FileStoreStatsMBean#getSegmentCount for monitoring the number of segments
Initial patch
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsMBean.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java Tue Jul 3 16:14:45 2018
@@ -16,16 +16,8 @@
*/
package org.apache.jackrabbit.oak.segment.azure;
-import com.google.common.base.Stopwatch;
-import com.microsoft.azure.storage.StorageException;
-import com.microsoft.azure.storage.blob.CloudBlobDirectory;
-import com.microsoft.azure.storage.blob.CloudBlockBlob;
-import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor;
-import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
-import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteAction;
-import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteQueue;
-import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
-import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
+import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.getSegmentFileName;
+import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.readBufferFully;
import java.io.File;
import java.io.IOException;
@@ -38,8 +30,15 @@ import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.getSegmentFileName;
-import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.readBufferFully;
+import com.google.common.base.Stopwatch;
+import com.microsoft.azure.storage.StorageException;
+import com.microsoft.azure.storage.blob.CloudBlobDirectory;
+import com.microsoft.azure.storage.blob.CloudBlockBlob;
+import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteAction;
+import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteQueue;
+import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor;
+import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
+import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
public class AzureSegmentArchiveWriter implements SegmentArchiveWriter {
@@ -150,6 +149,11 @@ public class AzureSegmentArchiveWriter i
}
@Override
+ public int getEntryCount() {
+ return index.size();
+ }
+
+ @Override
public void close() throws IOException {
if (queue.isPresent()) { // required to handle IOException
SegmentWriteQueue q = queue.get();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Tue Jul 3 16:14:45 2018
@@ -272,6 +272,15 @@ public class FileStore extends AbstractF
}
}
+ /**
+ * @return the number of segments in the segment store
+ */
+ public int getSegmentCount() {
+ try (ShutDownCloser ignored = shutDown.keepAlive()) {
+ return tarFiles.segmentCount();
+ }
+ }
+
public FileStoreStats getStats() {
return stats;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStats.java Tue Jul 3 16:14:45 2018
@@ -86,6 +86,11 @@ public class FileStoreStats implements F
return store.readerCount() + 1; //1 for the writer
}
+ @Override
+ public int getSegmentCount() {
+ return store.getSegmentCount();
+ }
+
@Nonnull
@Override
public CompositeData getWriteStats() {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsMBean.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsMBean.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreStatsMBean.java Tue Jul 3 16:14:45 2018
@@ -27,9 +27,17 @@ public interface FileStoreStatsMBean {
long getApproximateSize();
+ /**
+ * @return the number of tar files in the segment store
+ */
int getTarFileCount();
/**
+ * @return the number of segments in the segment store
+ */
+ int getSegmentCount();
+
+ /**
* @return time series of the writes to repository
*/
CompositeData getWriteStats();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java Tue Jul 3 16:14:45 2018
@@ -18,15 +18,9 @@
*/
package org.apache.jackrabbit.oak.segment.file.tar;
-import com.google.common.base.Stopwatch;
-import org.apache.jackrabbit.oak.segment.file.tar.index.IndexWriter;
-import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry;
-import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry;
-import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor;
-import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
-import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Charsets.UTF_8;
+import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.BLOCK_SIZE;
import java.io.File;
import java.io.IOException;
@@ -40,9 +34,15 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.zip.CRC32;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.BLOCK_SIZE;
+import com.google.common.base.Stopwatch;
+import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry;
+import org.apache.jackrabbit.oak.segment.file.tar.index.IndexWriter;
+import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry;
+import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor;
+import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
+import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SegmentTarWriter implements SegmentArchiveWriter {
@@ -181,6 +181,11 @@ public class SegmentTarWriter implements
return length;
}
+ @Override
+ public int getEntryCount() {
+ return index.size();
+ }
+
private void writeIndex() throws IOException {
IndexWriter writer = IndexWriter.newIndexWriter(BLOCK_SIZE);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java Tue Jul 3 16:14:45 2018
@@ -51,12 +51,12 @@ import javax.annotation.Nonnull;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.oak.segment.file.FileReaper;
import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor;
import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter;
import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
-import org.apache.jackrabbit.oak.segment.file.FileReaper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -447,6 +447,29 @@ public class TarFiles implements Closeab
return Iterables.size(iterable(head));
}
+ /**
+ * @return the number of segments in the segment store
+ */
+ public int segmentCount() {
+ int count = 0;
+ Node head;
+
+ lock.readLock().lock();
+ try {
+ if (writer != null) {
+ count = writer.getEntryCount();
+ }
+ head = readers;
+ } finally {
+ lock.readLock().unlock();
+ }
+
+ for (TarReader reader : iterable(head)) {
+ count += reader.getEntries().length;
+ }
+ return count;
+ }
+
public void flush() throws IOException {
lock.readLock().lock();
try {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java Tue Jul 3 16:14:45 2018
@@ -103,6 +103,13 @@ class TarWriter implements Closeable {
}
/**
+ * @return the number of entries currently in this writer
+ */
+ int getEntryCount() {
+ return archive.getEntryCount();
+ }
+
+ /**
* If the given segment is in this file, get the byte buffer that allows
* reading it.
*
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java Tue Jul 3 16:14:45 2018
@@ -18,11 +18,12 @@
*/
package org.apache.jackrabbit.oak.segment.spi.persistence;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.nio.ByteBuffer;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
/**
* Represents a write-enabled, append-only archive. It allows to append segments
* and other data structures (segment graph, serialized binary references) to the
@@ -107,6 +108,13 @@ public interface SegmentArchiveWriter {
long getLength();
/**
+ * Get the number of entries currently contained in the archive.
+ *
+ * @return number of entries
+ */
+ int getEntryCount();
+
+ /**
* Close the archive.
*/
void close() throws IOException;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreTest.java Tue Jul 3 16:14:45 2018
@@ -20,10 +20,13 @@
package org.apache.jackrabbit.oak.segment.file;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import org.apache.jackrabbit.oak.segment.SegmentId;
+import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
+import org.apache.jackrabbit.oak.segment.SegmentNodeState;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -64,4 +67,22 @@ public class FileStoreTest {
}
}
+ @Test
+ public void segmentCount() throws Exception {
+ try (FileStore fileStore = fileStoreBuilder(getFileStoreFolder()).build()) {
+ assertEquals(1, fileStore.getSegmentCount());
+
+ SegmentNodeState head = fileStore.getHead();
+ SegmentNodeBuilder builder = head.builder();
+ builder.setProperty("a", 1);
+ SegmentNodeState newHead = builder.getNodeState();
+
+ fileStore.getRevisions().setHead(head.getRecordId(), newHead.getRecordId());
+ fileStore.flush();
+
+ assertEquals(2, fileStore.getSegmentCount());
+ }
+ }
+
+
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java?rev=1834999&r1=1834998&r2=1834999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java Tue Jul 3 16:14:45 2018
@@ -164,6 +164,19 @@ public class TarFilesTest {
}
@Test
+ public void testInitialSegmentCount() {
+ assertEquals(0, tarFiles.segmentCount());
+ }
+
+ @Test
+ public void testSegmentCount() throws IOException {
+ UUID id = randomUUID();
+ writeSegment(id);
+ tarFiles.newWriter();
+ assertEquals(1, tarFiles.segmentCount());
+ }
+
+ @Test
public void testInitialContainsSegment() throws Exception {
UUID id = randomUUID();
assertFalse(containsSegment(id));