Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TenantControl - creating cache records must use tenant #17121

Merged
merged 4 commits into from Jun 24, 2020
Merged

TenantControl - creating cache records must use tenant #17121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daa86a0
invoke tenant control when creating cache, so
lprimak Jun 23, 2020
08482d9
Merge remote-tracking branch 'upstream/3.12.z' into TENANT_CACHE_CREA…
lprimak Jun 23, 2020
17c4134
- using ExceptionUtils.rethrow() instead of throw RuntimeException()
lprimak Jun 23, 2020
308765a
fixed failing test
lprimak Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 37 additions & 23 deletions hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheRecordStore.java
View file
Open in desktop
Expand Up @@ -94,6 +94,7 @@
import static com.hazelcast.cache.impl.operation.MutableOperation.IGNORE_COMPLETION;
import static com.hazelcast.cache.impl.record.CacheRecord.TIME_NOT_AVAILABLE;
import static com.hazelcast.cache.impl.record.CacheRecordFactory.isExpiredAt;
import com.hazelcast.config.CacheConfigAccessor;
import static com.hazelcast.config.CacheConfigAccessor.getTenantControl;
import static com.hazelcast.internal.config.ConfigValidator.checkEvictionConfig;
import static com.hazelcast.nio.IOUtil.closeResource;
Expand All @@ -102,6 +103,7 @@
import static com.hazelcast.util.MapUtil.createHashMap;
import static com.hazelcast.util.SetUtil.createHashSet;
import static com.hazelcast.util.ThreadUtil.assertRunningOnPartitionThread;
import java.io.IOException;
import static java.util.Collections.emptySet;

@SuppressWarnings({"checkstyle:methodcount", "checkstyle:classfanoutcomplexity"})
Expand Down Expand Up @@ -162,13 +164,42 @@ public AbstractCacheRecordStore(String cacheNameWithPrefix, int partitionId, Nod
throw new CacheNotExistsException("Cache " + cacheNameWithPrefix + " is already destroyed or not created yet, on "
+ nodeEngine.getLocalMember());
}
this.eventJournalConfig = nodeEngine.getConfig().findCacheEventJournalConfig(cacheConfig.getName());
this.evictionConfig = cacheConfig.getEvictionConfig();
if (evictionConfig == null) {
throw new IllegalStateException("Eviction config cannot be null!");
Closeable tenantContext = CacheConfigAccessor.getTenantControl(cacheConfig).setTenant(true);
try {
this.eventJournalConfig = nodeEngine.getConfig().findCacheEventJournalConfig(cacheConfig.getName());
this.evictionConfig = cacheConfig.getEvictionConfig();
if (evictionConfig == null) {
throw new IllegalStateException("Eviction config cannot be null!");
}
this.wanReplicationEnabled = cacheService.isWanReplicationEnabled(cacheNameWithPrefix);
this.disablePerEntryInvalidationEvents = cacheConfig.isDisablePerEntryInvalidationEvents();
initializeStatisticsAndFactories(cacheNameWithPrefix);
this.cacheContext = cacheService.getOrCreateCacheContext(cacheNameWithPrefix);
this.records = createRecordCacheMap();
this.evictionChecker = createCacheEvictionChecker(evictionConfig.getSize(), evictionConfig.getMaximumSizePolicy());
this.evictionPolicyEvaluator = createEvictionPolicyEvaluator(evictionConfig);
this.evictionStrategy = createEvictionStrategy(evictionConfig);
this.objectNamespace = CacheService.getObjectNamespace(cacheNameWithPrefix);
this.persistWanReplicatedData = canPersistWanReplicatedData(cacheConfig, nodeEngine);
this.cacheRecordFactory = new CacheRecordFactory(cacheConfig.getInMemoryFormat(), ss);
this.valueComparator = getValueComparatorOf(cacheConfig.getInMemoryFormat());
this.clearExpiredRecordsTask = cacheService.getExpirationManager().getTask();

injectDependencies(evictionPolicyEvaluator.getEvictionPolicyComparator());
registerResourceIfItIsClosable(cacheWriter);
registerResourceIfItIsClosable(cacheLoader);
registerResourceIfItIsClosable(defaultExpiryPolicy);
init();
} finally {
try {
tenantContext.close();
} catch (IOException ex) {
ExceptionUtil.rethrow(ex);
}
}
this.wanReplicationEnabled = cacheService.isWanReplicationEnabled(cacheNameWithPrefix);
this.disablePerEntryInvalidationEvents = cacheConfig.isDisablePerEntryInvalidationEvents();
}

private void initializeStatisticsAndFactories(String cacheNameWithPrefix) {
if (cacheConfig.isStatisticsEnabled()) {
statistics = cacheService.createCacheStatIfAbsent(cacheNameWithPrefix);
}
Expand All @@ -192,23 +223,6 @@ public AbstractCacheRecordStore(String cacheNameWithPrefix, int partitionId, Nod
} else {
throw new IllegalStateException("Expiry policy factory cannot be null!");
}

this.cacheContext = cacheService.getOrCreateCacheContext(cacheNameWithPrefix);
this.records = createRecordCacheMap();
this.evictionChecker = createCacheEvictionChecker(evictionConfig.getSize(), evictionConfig.getMaximumSizePolicy());
this.evictionPolicyEvaluator = createEvictionPolicyEvaluator(evictionConfig);
this.evictionStrategy = createEvictionStrategy(evictionConfig);
this.objectNamespace = CacheService.getObjectNamespace(cacheNameWithPrefix);
this.persistWanReplicatedData = canPersistWanReplicatedData(cacheConfig, nodeEngine);
this.cacheRecordFactory = new CacheRecordFactory(cacheConfig.getInMemoryFormat(), ss);
this.valueComparator = getValueComparatorOf(cacheConfig.getInMemoryFormat());
this.clearExpiredRecordsTask = cacheService.getExpirationManager().getTask();

injectDependencies(evictionPolicyEvaluator.getEvictionPolicyComparator());
registerResourceIfItIsClosable(cacheWriter);
registerResourceIfItIsClosable(cacheLoader);
registerResourceIfItIsClosable(defaultExpiryPolicy);
init();
}

// Overridden in EE
Expand Down
8 changes: 4 additions & 4 deletions hazelcast/src/test/java/com/hazelcast/cache/CacheTenantControlTest.java
View file
Open in desktop
Expand Up @@ -138,11 +138,11 @@ public void testTenantControl_executionBeforeAfterOps() {
cache.destroy();

assertEquals(1, saveCurrentCount.get());
// expecting tenant context is created & closed 4 times:
// 1 time on creation of record store (wrapping initialization of eviction policy)
// expecting tenant context is created & closed 5 times:
// 2 times on creation of record store (wrapping initialization of eviction policy)
// + 3 times on before/afterRun of put, get & getAndPut operations
assertEquals(4, setTenantCount.get());
assertEquals(4, closeTenantCount.get());
assertEquals(5, setTenantCount.get());
assertEquals(5, closeTenantCount.get());
assertEquals(1, unregisterTenantCount.get());
}

Expand Down