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 to...@apache.org on 2018/04/10 11:34:15 UTC
svn commit: r1828806 - in /jackrabbit/oak/trunk:
oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/
Author: tomekr
Date: Tue Apr 10 11:34:15 2018
New Revision: 1828806
URL: http://svn.apache.org/viewvc?rev=1828806&view=rev
Log:
OAK-7394: ConsolidatedCacheStats broken on the Composite Node Store
Added:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/RoleUtils.java
- copied, changed from r1828805, jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
Added: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java?rev=1828806&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java (added)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java Tue Apr 10 11:34:15 2018
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.cache;
+
+import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
+
+public class CacheStatsMBeanWrapper implements CacheStatsMBean {
+
+ private final CacheStatsMBean delegate;
+
+ public CacheStatsMBeanWrapper(CacheStatsMBean delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public String getName() {
+ return delegate.getName();
+ }
+
+ @Override
+ public long getRequestCount() {
+ return delegate.getRequestCount();
+ }
+
+ @Override
+ public long getHitCount() {
+ return delegate.getHitCount();
+ }
+
+ @Override
+ public double getHitRate() {
+ return delegate.getHitRate();
+ }
+
+ @Override
+ public long getMissCount() {
+ return delegate.getMissCount();
+ }
+
+ @Override
+ public double getMissRate() {
+ return delegate.getMissRate();
+ }
+
+ @Override
+ public long getLoadCount() {
+ return delegate.getLoadCount();
+ }
+
+ @Override
+ public long getLoadSuccessCount() {
+ return delegate.getLoadSuccessCount();
+ }
+
+ @Override
+ public long getLoadExceptionCount() {
+ return delegate.getLoadExceptionCount();
+ }
+
+ @Override
+ public double getLoadExceptionRate() {
+ return delegate.getLoadExceptionRate();
+ }
+
+ @Override
+ public long getTotalLoadTime() {
+ return delegate.getTotalLoadTime();
+ }
+
+ @Override
+ public double getAverageLoadPenalty() {
+ return delegate.getAverageLoadPenalty();
+ }
+
+ @Override
+ public long getEvictionCount() {
+ return delegate.getEvictionCount();
+ }
+
+ @Override
+ public long getElementCount() {
+ return delegate.getElementCount();
+ }
+
+ @Override
+ public long getMaxTotalWeight() {
+ return delegate.getMaxTotalWeight();
+ }
+
+ @Override
+ public long estimateCurrentWeight() {
+ return delegate.estimateCurrentWeight();
+ }
+
+ @Override
+ public String cacheInfoAsString() {
+ return delegate.cacheInfoAsString();
+ }
+
+ @Override
+ public void resetStats() {
+ delegate.resetStats();
+ }
+}
Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java?rev=1828806&r1=1828805&r2=1828806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java Tue Apr 10 11:34:15 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
+@Version("1.1.0")
package org.apache.jackrabbit.oak.cache;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
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=1828806&r1=1828805&r2=1828806&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 Tue Apr 10 11:34:15 2018
@@ -100,6 +100,7 @@ import org.apache.jackrabbit.oak.api.jmx
import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean;
import org.apache.jackrabbit.oak.backup.impl.FileStoreBackupRestoreImpl;
import org.apache.jackrabbit.oak.cache.CacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStatsMBeanWrapper;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.blob.BlobGC;
import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean;
@@ -119,6 +120,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.segment.file.MetricsIOMonitor;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
+import org.apache.jackrabbit.oak.segment.util.RoleUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo;
@@ -519,7 +521,7 @@ public class SegmentNodeStoreService {
// Expose stats about the segment cache
- CacheStatsMBean segmentCacheStats = store.getSegmentCacheStats();
+ CacheStatsMBean segmentCacheStats = addRoleToName(store.getSegmentCacheStats(), role);
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
segmentCacheStats,
@@ -529,7 +531,7 @@ public class SegmentNodeStoreService {
// Expose stats about the string and template caches
- CacheStatsMBean stringCacheStats = store.getStringCacheStats();
+ CacheStatsMBean stringCacheStats = addRoleToName(store.getStringCacheStats(), role);
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
stringCacheStats,
@@ -537,7 +539,7 @@ public class SegmentNodeStoreService {
stringCacheStats.getName()
));
- CacheStatsMBean templateCacheStats = store.getTemplateCacheStats();
+ CacheStatsMBean templateCacheStats = addRoleToName(store.getTemplateCacheStats(), role);
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
templateCacheStats,
@@ -546,7 +548,7 @@ public class SegmentNodeStoreService {
));
WriterCacheManager cacheManager = builder.getCacheManager();
- CacheStatsMBean stringDeduplicationCacheStats = cacheManager.getStringCacheStats();
+ CacheStatsMBean stringDeduplicationCacheStats = addRoleToName(cacheManager.getStringCacheStats(), role);
if (stringDeduplicationCacheStats != null) {
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
@@ -556,7 +558,7 @@ public class SegmentNodeStoreService {
));
}
- CacheStatsMBean templateDeduplicationCacheStats = cacheManager.getTemplateCacheStats();
+ CacheStatsMBean templateDeduplicationCacheStats = addRoleToName(cacheManager.getTemplateCacheStats(), role);
if (templateDeduplicationCacheStats != null) {
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
@@ -566,7 +568,7 @@ public class SegmentNodeStoreService {
));
}
- CacheStatsMBean nodeDeduplicationCacheStats = cacheManager.getNodeCacheStats();
+ CacheStatsMBean nodeDeduplicationCacheStats = addRoleToName(cacheManager.getNodeCacheStats(), role);
if (nodeDeduplicationCacheStats != null) {
closeables.add(registrations.registerMBean(
CacheStatsMBean.class,
@@ -751,6 +753,14 @@ public class SegmentNodeStoreService {
closer = null;
}
+ private static CacheStatsMBean addRoleToName(CacheStatsMBean cacheStatsMBean, String role) {
+ return new CacheStatsMBeanWrapper(cacheStatsMBean) {
+ @Override
+ public String getName() {
+ return RoleUtils.maybeAppendRole(super.getName(), role);
+ }
+ };
+ }
}
/**
@@ -1025,10 +1035,7 @@ class Registrations {
}
private String maybeAppendRole(String name) {
- if (role != null) {
- return name + " - " + role;
- }
- return name;
+ return RoleUtils.maybeAppendRole(name, role);
}
private String jmxRole() {
Copied: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/RoleUtils.java (from r1828805, jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/RoleUtils.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/RoleUtils.java&p1=jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java&r1=1828805&r2=1828806&rev=1828806&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/RoleUtils.java Tue Apr 10 11:34:15 2018
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
-package org.apache.jackrabbit.oak.cache;
+package org.apache.jackrabbit.oak.segment.util;
-import org.osgi.annotation.versioning.Version;
\ No newline at end of file
+public final class RoleUtils {
+
+ private RoleUtils() {
+ }
+
+ public static String maybeAppendRole(String name, String role) {
+ if (role != null) {
+ return name + " - " + role;
+ }
+ return name;
+ }
+
+}