Skip to content

[12.x] Fixing RedisTaggedCache::flushStale with PhpRedisClusterConnection #57837

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

Merged
merged 4 commits into from
Nov 20, 2025
+34 −9
Merged

[12.x] Fixing RedisTaggedCache::flushStale with PhpRedisClusterConnection #57837

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
c8d03e7
[12.x] mark certain tests skipped in RedisStoreTest
vadimonus Nov 19, 2025
f391043
[12.x] flushStaleEntries for PhpRedisCluster in RedisTagSet
vadimonus Nov 8, 2025
e228fea
[12.x] unskip test for many (fixed in https://github.com/laravel/fram…
vadimonus Nov 20, 2025
09bfc9a
Update RedisTagSet.php
taylorotwell Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Illuminate/Cache/RedisTagSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,19 @@ public function entries()
*/
public function flushStaleEntries()
{
$this->store->connection()->pipeline(function ($pipe) {
$flushStaleEntries = function ($pipe) {
foreach ($this->tagIds() as $tagKey) {
$pipe->zremrangebyscore($this->store->getPrefix().$tagKey, 0, Carbon::now()->getTimestamp());
}
});
};

$connection = $this->store->connection();

if ($connection instanceof PhpRedisConnection) {
$flushStaleEntries($connection);
} else {
$connection->pipeline($flushStaleEntries);
}
}

/**
Expand Down
31 changes: 24 additions & 7 deletions tests/Integration/Cache/RedisStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Illuminate\Redis\Connections\PhpRedisClusterConnection;
use Illuminate\Redis\Connections\PredisClusterConnection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Sleep;
use Mockery as m;
use Orchestra\Testbench\TestCase;
Expand All @@ -23,12 +22,6 @@ protected function setUp(): void
{
$this->afterApplicationCreated(function () {
$this->setUpRedis();

$connection = $this->app['redis']->connection();
$this->markTestSkippedWhen(
$connection instanceof PhpRedisClusterConnection || $connection instanceof PredisClusterConnection,
'RedisStore currently does not support tags, many and some other on Redis Cluster cluster connections',
);
});

$this->beforeApplicationDestroyed(function () {
Expand Down Expand Up @@ -103,6 +96,8 @@ public function testItCanExpireWithZeroTTL()

public function testTagsCanBeAccessed()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->put('name', 'Sally', 5);
Expand All @@ -119,6 +114,8 @@ public function testTagsCanBeAccessed()

public function testTagEntriesCanBeStoredForever()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->forever('name', 'Sally');
Expand Down Expand Up @@ -151,6 +148,8 @@ public function testTagEntriesCanBeIncremented()

public function testIncrementedTagEntriesProperlyTurnStale()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['votes'])->add('person-1', 0, $seconds = 1);
Expand All @@ -167,6 +166,8 @@ public function testIncrementedTagEntriesProperlyTurnStale()

public function testPastTtlTagEntriesAreNotAdded()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['votes'])->add('person-1', 0, new DateTime('yesterday'));
Expand All @@ -180,6 +181,8 @@ public function testPastTtlTagEntriesAreNotAdded()

public function testPutPastTtlTagEntriesProperlyTurnStale()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['votes'])->put('person-1', 0, new DateTime('yesterday'));
Expand All @@ -191,6 +194,8 @@ public function testPutPastTtlTagEntriesProperlyTurnStale()

public function testTagsCanBeFlushedBySingleKey()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->put('person-1', 'Sally', 5);
Expand All @@ -207,6 +212,8 @@ public function testTagsCanBeFlushedBySingleKey()

public function testStaleEntriesCanBeFlushed()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->put('person-1', 'Sally', 1);
Expand Down Expand Up @@ -277,6 +284,8 @@ public function testIncrementWithSerializationEnabled()

public function testTagsCanBeFlushedWithLargeNumberOfKeys()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

$tags = ['large-test-'.time()];
Expand All @@ -298,4 +307,12 @@ public function testTagsCanBeFlushedWithLargeNumberOfKeys()
$keyCount = Cache::store('redis')->connection()->keys('*');
$this->assertCount(0, $keyCount);
}

protected function markTestSkippedWithPredisClusterConnection()
{
$this->markTestSkippedWhen(
$this->app['redis']->connection() instanceof PredisClusterConnection,
'This test currently fails on Predis Cluster connection',
);
}
}
Loading