Add support for binding CacheRemovalListener
This can be used to dynamically bind removal listeners for use in multi-master support. Change-Id: I9c58740c54c89e5bd75accc64f03f1fdddc8d581
This commit is contained in:
@@ -22,10 +22,12 @@ import com.google.common.cache.LoadingCache;
|
||||
import com.google.common.cache.Weigher;
|
||||
import com.google.gerrit.lifecycle.LifecycleModule;
|
||||
import com.google.gerrit.server.cache.CacheBinding;
|
||||
import com.google.gerrit.server.cache.ForwardingRemovalListener;;
|
||||
import com.google.gerrit.server.cache.MemoryCacheFactory;
|
||||
import com.google.gerrit.server.cache.PersistentCacheFactory;
|
||||
import com.google.gerrit.server.cache.h2.H2CacheImpl.ValueHolder;
|
||||
import com.google.gerrit.server.config.ConfigUtil;
|
||||
import com.google.gerrit.server.config.FactoryModule;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
@@ -37,6 +39,13 @@ public class DefaultCacheFactory implements MemoryCacheFactory {
|
||||
public static class Module extends LifecycleModule {
|
||||
@Override
|
||||
protected void configure() {
|
||||
install(new FactoryModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
factory(ForwardingRemovalListener.Factory.class);
|
||||
}
|
||||
});
|
||||
|
||||
bind(DefaultCacheFactory.class);
|
||||
bind(MemoryCacheFactory.class).to(DefaultCacheFactory.class);
|
||||
bind(PersistentCacheFactory.class).to(H2CacheFactory.class);
|
||||
@@ -45,10 +54,13 @@ public class DefaultCacheFactory implements MemoryCacheFactory {
|
||||
}
|
||||
|
||||
private final Config cfg;
|
||||
private final ForwardingRemovalListener.Factory forwardingRemovalListenerFactory;
|
||||
|
||||
@Inject
|
||||
public DefaultCacheFactory(@GerritServerConfig Config config) {
|
||||
public DefaultCacheFactory(@GerritServerConfig Config config,
|
||||
ForwardingRemovalListener.Factory forwardingRemovalListenerFactory) {
|
||||
this.cfg = config;
|
||||
this.forwardingRemovalListenerFactory = forwardingRemovalListenerFactory;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -73,6 +85,8 @@ public class DefaultCacheFactory implements MemoryCacheFactory {
|
||||
"cache", def.name(), "memoryLimit",
|
||||
def.maximumWeight()));
|
||||
|
||||
builder.removalListener(forwardingRemovalListenerFactory.create(def.name()));
|
||||
|
||||
Weigher<K, V> weigher = def.weigher();
|
||||
if (weigher != null && unwrapValueHolder) {
|
||||
final Weigher<K, V> impl = weigher;
|
||||
|
||||
23
gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheRemovalListener.java
vendored
Normal file
23
gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheRemovalListener.java
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
// Copyright (C) 2012 The Android Open Source Project
|
||||
//
|
||||
// Licensed 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 com.google.gerrit.server.cache;
|
||||
|
||||
import com.google.common.cache.RemovalNotification;
|
||||
|
||||
public interface CacheRemovalListener<K,V> {
|
||||
public void onRemoval(String pluginName,
|
||||
String cacheName,
|
||||
RemovalNotification<K, V> notification);
|
||||
}
|
||||
60
gerrit-server/src/main/java/com/google/gerrit/server/cache/ForwardingRemovalListener.java
vendored
Normal file
60
gerrit-server/src/main/java/com/google/gerrit/server/cache/ForwardingRemovalListener.java
vendored
Normal file
@@ -0,0 +1,60 @@
|
||||
// Copyright (C) 2012 The Android Open Source Project
|
||||
//
|
||||
// Licensed 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 com.google.gerrit.server.cache;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.cache.RemovalListener;
|
||||
import com.google.common.cache.RemovalNotification;
|
||||
import com.google.gerrit.extensions.registration.DynamicSet;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.assistedinject.Assisted;
|
||||
|
||||
/**
|
||||
* This listener dispatches removal events to all other RemovalListeners
|
||||
* attached via the DynamicSet API.
|
||||
*
|
||||
* @param <K>
|
||||
* @param <V>
|
||||
*/
|
||||
@SuppressWarnings("rawtypes")
|
||||
public class ForwardingRemovalListener<K, V> implements RemovalListener<K, V> {
|
||||
public interface Factory {
|
||||
ForwardingRemovalListener create(String cacheName);
|
||||
}
|
||||
|
||||
private final DynamicSet<CacheRemovalListener> listeners;
|
||||
private final String cacheName;
|
||||
private String pluginName = "gerrit";
|
||||
|
||||
@Inject
|
||||
ForwardingRemovalListener(DynamicSet<CacheRemovalListener> listeners,
|
||||
@Assisted String cacheName) {
|
||||
this.listeners = listeners;
|
||||
this.cacheName = cacheName;
|
||||
}
|
||||
|
||||
@Inject(optional = true)
|
||||
void setPluginName(String name) {
|
||||
if (!Strings.isNullOrEmpty(name)) {
|
||||
this.pluginName = name;
|
||||
}
|
||||
}
|
||||
|
||||
public void onRemoval(RemovalNotification<K, V> notification) {
|
||||
for (CacheRemovalListener<K, V> l : listeners) {
|
||||
l.onRemoval(pluginName, cacheName, notification);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,6 +48,7 @@ import com.google.gerrit.server.account.InternalGroupBackend;
|
||||
import com.google.gerrit.server.account.Realm;
|
||||
import com.google.gerrit.server.account.UniversalGroupBackend;
|
||||
import com.google.gerrit.server.auth.ldap.LdapModule;
|
||||
import com.google.gerrit.server.cache.CacheRemovalListener;
|
||||
import com.google.gerrit.server.events.EventFactory;
|
||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gerrit.server.git.ChangeMergeQueue;
|
||||
@@ -169,6 +170,7 @@ public class GerritGlobalModule extends FactoryModule {
|
||||
|
||||
bind(GitReferenceUpdated.class);
|
||||
DynamicMap.mapOf(binder(), new TypeLiteral<Cache<?, ?>>() {});
|
||||
DynamicSet.setOf(binder(), CacheRemovalListener.class);
|
||||
DynamicSet.setOf(binder(), GitReferenceUpdatedListener.class);
|
||||
DynamicSet.setOf(binder(), NewProjectCreatedListener.class);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user