-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
IGNITE-23971 Fix striped queue overflow in ScanQuery for caches with …
…touched or accessed TTL expire policy - Fixes #11736. Signed-off-by: Aleksey Plekhanov <[email protected]>
- Loading branch information
1 parent
2d69600
commit 510fa7b
Showing
4 changed files
with
130 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
...c/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryUpdateTtlTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * 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.ignite.internal.processors.cache.query; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.cache.expiry.Duration; | ||
| import javax.cache.expiry.TouchedExpiryPolicy; | ||
| import org.apache.ignite.IgniteException; | ||
| import org.apache.ignite.cache.query.ScanQuery; | ||
| import org.apache.ignite.cluster.ClusterNode; | ||
| import org.apache.ignite.configuration.CacheConfiguration; | ||
| import org.apache.ignite.configuration.IgniteConfiguration; | ||
| import org.apache.ignite.internal.IgniteEx; | ||
| import org.apache.ignite.internal.TestRecordingCommunicationSpi; | ||
| import org.apache.ignite.internal.managers.communication.GridIoMessage; | ||
| import org.apache.ignite.internal.processors.cache.KeyCacheObject; | ||
| import org.apache.ignite.internal.processors.cache.distributed.GridCacheTtlUpdateRequest; | ||
| import org.apache.ignite.internal.util.typedef.internal.U; | ||
| import org.apache.ignite.lang.IgniteInClosure; | ||
| import org.apache.ignite.plugin.extensions.communication.Message; | ||
| import org.apache.ignite.spi.IgniteSpiException; | ||
| import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.apache.ignite.internal.processors.cache.query.ScanQueryIterator.EXPIRE_ENTRIES_FLUSH_CNT; | ||
|
|
||
| /** */ | ||
| public class ScanQueryUpdateTtlTest extends GridCommonAbstractTest { | ||
| /** */ | ||
| private static final int KEYS = EXPIRE_ENTRIES_FLUSH_CNT * 3; | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { | ||
| IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); | ||
|
|
||
| if (!cfg.isClientMode()) { | ||
| cfg.setCacheConfiguration(new CacheConfiguration<>(DEFAULT_CACHE_NAME) | ||
| .setBackups(1) | ||
| .setExpiryPolicyFactory(TouchedExpiryPolicy.factoryOf(new Duration(TimeUnit.MINUTES, 60)))); | ||
| } | ||
|
|
||
| cfg.setCommunicationSpi(new CheckingCommunicationSpi()); | ||
|
|
||
| return cfg; | ||
| } | ||
|
|
||
| /** */ | ||
| @Test | ||
| public void testScanQueryIteratorExpireEntriesFlush() throws Exception { | ||
| try (IgniteEx ignored = startGrids(2)) { | ||
| try (IgniteEx cln = startClientGrid(2)) { | ||
| for (int i = 0; i < KEYS; i++) | ||
| cln.cache(DEFAULT_CACHE_NAME).put(i, i); | ||
|
|
||
| cln.cache(DEFAULT_CACHE_NAME).query(new ScanQuery<>()).forEach((v) -> {}); | ||
| } | ||
|
|
||
| grid(0).context().pools().getStripedExecutorService().awaitComplete(); | ||
| grid(1).context().pools().getStripedExecutorService().awaitComplete(); | ||
|
|
||
| assertTrue("Each key must be sent only once", CheckingCommunicationSpi.keyCnt.values().stream().allMatch(c -> c == 1)); | ||
|
|
||
| // Check here for (EXPIRE_ENTRIES_FLUSH_CNT + 1) since CacheExpiryPolicy::readyToFlush method | ||
| // checks as (entries.size() > EXPIRE_ENTRIES_FLUSH_CNT) before flush. | ||
| assertTrue("Single GridCacheTtlUpdateRequest must be sent with no more then maximum allowed keys " + | ||
| "[maxAllowed=" + (EXPIRE_ENTRIES_FLUSH_CNT + 1) + | ||
| ", maxActual=" + CheckingCommunicationSpi.maxKeyBatchCnt + "]", | ||
| CheckingCommunicationSpi.maxKeyBatchCnt <= EXPIRE_ENTRIES_FLUSH_CNT + 1); | ||
|
|
||
| assertEquals("All keys must be sent", KEYS, CheckingCommunicationSpi.keyCnt.keySet().size()); | ||
| } | ||
| } | ||
|
|
||
| /** */ | ||
| private static class CheckingCommunicationSpi extends TestRecordingCommunicationSpi { | ||
| /** */ | ||
| private static int maxKeyBatchCnt = 0; | ||
|
|
||
| /** */ | ||
| private static final Map<KeyCacheObject, Integer> keyCnt = new ConcurrentHashMap<>(U.capacity(KEYS)); | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC) | ||
| throws IgniteSpiException { | ||
| if ((msg instanceof GridIoMessage) && (((GridIoMessage)msg).message() instanceof GridCacheTtlUpdateRequest)) { | ||
| GridCacheTtlUpdateRequest ttlUpdReq = (GridCacheTtlUpdateRequest)((GridIoMessage)msg).message(); | ||
|
|
||
| if (ttlUpdReq.keys().size() > maxKeyBatchCnt) | ||
| maxKeyBatchCnt = ttlUpdReq.keys().size(); | ||
|
|
||
| for (KeyCacheObject key : ttlUpdReq.keys()) | ||
| keyCnt.put(key, keyCnt.getOrDefault(key, 0) + 1); | ||
| } | ||
|
|
||
| super.sendMessage(node, msg, ackC); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters