From 07378286f5dfcb3bf31466bd16edb3b3d81c4211 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 15 Mar 2024 16:51:24 +1000 Subject: [PATCH 1/9] Add redis-cluster CI job --- .github/workflows/tests.yml | 94 +++++++++++++++++++++++++++++++++++++ tests/TestCase.php | 2 + 2 files changed, 96 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ba6cf92f..cc2b8d25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -225,3 +225,97 @@ jobs: run: vendor/bin/pest env: DB_CONNECTION: sqlite + + redis-cluster: + runs-on: ubuntu-22.04 + + services: + redis-node-0: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + + redis-node-1: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + + redis-node-2: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + + redis-node-3: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + + redis-node-4: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + + redis-node-5: + image: bitnami/redis-cluster + env: + ALLOW_EMPTY_PASSWORD: yes + REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 + REDIS_CLUSTER_REPLICAS: 1 + REDIS_CLUSTER_CREATOR: yes + ports: + - 6379:6379 + + mysql: + image: mysql:5.7 + env: + MYSQL_RANDOM_ROOT_PASSWORD: yes + MYSQL_DATABASE: pulse + MYSQL_USER: pulse + MYSQL_PASSWORD: password + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + matrix: + php: [8.3] + laravel: [11] + stability: [prefer-stable] + + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - Redis Cluster (with MySQL 5.7) + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, redis, pcntl, zip + ini-values: error_reporting=E_ALL + tools: composer:v2 + coverage: none + + - name: Install redis-cli + run: sudo apt-get install -qq redis-tools + + - name: Install dependencies + run: | + composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} + + - name: Execute tests + run: vendor/bin/pest + env: + DB_CONNECTION: mysql + DB_DATABASE: pulse + DB_USERNAME: pulse + DB_PASSWORD: password + DB_COLLATION: utf8mb4_unicode_ci + PULSE_REDIS_CONNECTION: cluster-test diff --git a/tests/TestCase.php b/tests/TestCase.php index fc9ebb57..ae2c4e34 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -25,6 +25,8 @@ protected function defineEnvironment($app): void { tap($app['config'], function (Repository $config) { $config->set('queue.failed.driver', 'null'); + + $config->set('database.redis.clusters.cluster-test.0', $config->get('database.redis.default')); }); } } From 5d10ec749247558d6c5b90feec326fd697bf6793 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 15 Mar 2024 17:15:39 +1000 Subject: [PATCH 2/9] Add support for phpredis RedisCluster types --- src/Support/RedisAdapter.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Support/RedisAdapter.php b/src/Support/RedisAdapter.php index d4dabd14..22fcf30e 100644 --- a/src/Support/RedisAdapter.php +++ b/src/Support/RedisAdapter.php @@ -10,6 +10,7 @@ use Predis\Pipeline\Pipeline; use Predis\Response\ServerException as PredisServerException; use Redis as PhpRedis; +use RedisCluster as PhpRedisCluster; /** * @internal @@ -113,7 +114,7 @@ protected function handle(array $args): mixed { try { return tap($this->run($args), function ($result) use ($args) { - if ($result === false && $this->client() instanceof PhpRedis) { + if ($result === false && ($this->client() instanceof PhpRedis || $this->client() instanceof PhpRedisCluster)) { throw RedisServerException::whileRunningCommand(implode(' ', $args), $this->client()->getLastError() ?? 'An unknown error occurred.'); } }); @@ -130,7 +131,8 @@ protected function handle(array $args): mixed protected function run(array $args): mixed { return match (true) { - $this->client() instanceof PhpRedis => $this->client()->rawCommand(...$args), + $this->client() instanceof PhpRedis, + $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(...$args), $this->client() instanceof Predis, $this->client() instanceof Pipeline => $this->client()->executeCommand(RawCommand::create(...$args)), }; @@ -139,7 +141,7 @@ protected function run(array $args): mixed /** * Retrieve the Redis client. */ - protected function client(): PhpRedis|Predis|Pipeline + protected function client(): PhpRedis|Predis|Pipeline|PhpRedisCluster { return $this->client ?? $this->connection->client(); } From ec80e79f327d3f36dbfc0a560388e835088741df Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:11:34 +1100 Subject: [PATCH 3/9] wip --- src/Support/RedisAdapter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Support/RedisAdapter.php b/src/Support/RedisAdapter.php index 22fcf30e..c6fcfd62 100644 --- a/src/Support/RedisAdapter.php +++ b/src/Support/RedisAdapter.php @@ -131,8 +131,8 @@ protected function handle(array $args): mixed protected function run(array $args): mixed { return match (true) { - $this->client() instanceof PhpRedis, - $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(...$args), + $this->client() instanceof PhpRedis => $this->client()->rawCommand(...$args), + $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand('redis-node-0', ...$args), $this->client() instanceof Predis, $this->client() instanceof Pipeline => $this->client()->executeCommand(RawCommand::create(...$args)), }; From a0a84c180649069e3e4591522299e3b9bb80d8e3 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:13:22 +1100 Subject: [PATCH 4/9] wip --- .github/workflows/coding-standards.yml | 7 - .github/workflows/compile-assets.yml | 10 -- .github/workflows/facade.yml | 43 ------- .github/workflows/issues.yml | 12 -- .github/workflows/pull-requests.yml | 12 -- .github/workflows/static-analysis.yml | 15 --- .github/workflows/tests.yml | 172 ------------------------- .github/workflows/update-changelog.yml | 9 -- 8 files changed, 280 deletions(-) delete mode 100644 .github/workflows/coding-standards.yml delete mode 100644 .github/workflows/compile-assets.yml delete mode 100644 .github/workflows/facade.yml delete mode 100644 .github/workflows/issues.yml delete mode 100644 .github/workflows/pull-requests.yml delete mode 100644 .github/workflows/static-analysis.yml delete mode 100644 .github/workflows/update-changelog.yml diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml deleted file mode 100644 index 0d0a5890..00000000 --- a/.github/workflows/coding-standards.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: fix code styling - -on: [push] - -jobs: - lint: - uses: laravel/.github/.github/workflows/coding-standards.yml@main diff --git a/.github/workflows/compile-assets.yml b/.github/workflows/compile-assets.yml deleted file mode 100644 index 406fd406..00000000 --- a/.github/workflows/compile-assets.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: compile assets - -on: [push] - -jobs: - compile: - uses: laravel/.github/.github/workflows/compile-assets.yml@main - with: - cmd: build - build_path: "dist/" diff --git a/.github/workflows/facade.yml b/.github/workflows/facade.yml deleted file mode 100644 index 3d5aadc3..00000000 --- a/.github/workflows/facade.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: facades - -on: - push: - branches: - - master - - '*.x' - -jobs: - update: - runs-on: ubuntu-22.04 - - strategy: - fail-fast: true - - name: Facade DocBlocks - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.1 - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: "composer config repositories.facade-documenter vcs git@github.com:laravel/facade-documenter.git && composer require --dev laravel/facade-documenter:dev-main" - - - name: Update facade docblocks - run: php -f vendor/bin/facade.php -- Laravel\\Pulse\\Facades\\Pulse - - - name: Commit facade docblocks - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Update facade docblocks - file_pattern: src/ diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml deleted file mode 100644 index 9634a0ed..00000000 --- a/.github/workflows/issues.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: issues - -on: - issues: - types: [labeled] - -permissions: - issues: write - -jobs: - help-wanted: - uses: laravel/.github/.github/workflows/issues.yml@main diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml deleted file mode 100644 index 18b32b32..00000000 --- a/.github/workflows/pull-requests.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: pull requests - -on: - pull_request_target: - types: [opened] - -permissions: - pull-requests: write - -jobs: - uneditable: - uses: laravel/.github/.github/workflows/pull-requests.yml@main diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index 368c1858..00000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: static analysis - -on: - push: - branches: - - master - - '*.x' - pull_request: - -permissions: - contents: read - -jobs: - tests: - uses: laravel/.github/.github/workflows/static-analysis.yml@main diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cc2b8d25..a8151395 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,178 +10,6 @@ on: - cron: '0 0 * * *' jobs: - mysql: - runs-on: ubuntu-22.04 - - services: - mysql: - image: mysql:5.7 - env: - MYSQL_RANDOM_ROOT_PASSWORD: yes - MYSQL_DATABASE: pulse - MYSQL_USER: pulse - MYSQL_PASSWORD: password - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - redis: - image: redis - ports: - - 6379:6379 - options: --entrypoint redis-server - - strategy: - fail-fast: true - matrix: - php: [8.1, 8.2, 8.3] - laravel: [10, 11] - stability: [prefer-lowest, prefer-stable] - - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MySQL 5.7 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, redis, pcntl, zip - ini-values: error_reporting=E_ALL - tools: composer:v2 - coverage: none - - - name: Install redis-cli - run: sudo apt-get install -qq redis-tools - - - name: Install dependencies - run: | - composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} - - - name: Execute tests - run: vendor/bin/pest - env: - DB_CONNECTION: mysql - DB_DATABASE: pulse - DB_USERNAME: pulse - DB_PASSWORD: password - DB_COLLATION: utf8mb4_unicode_ci - - mariadb: - runs-on: ubuntu-22.04 - - services: - mysql: - image: mariadb:10 - env: - MYSQL_RANDOM_ROOT_PASSWORD: yes - MYSQL_DATABASE: pulse - MYSQL_USER: pulse - MYSQL_PASSWORD: password - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - redis: - image: redis - ports: - - 6379:6379 - options: --entrypoint redis-server - - strategy: - fail-fast: true - matrix: - php: [8.3] - laravel: [11] - stability: [prefer-stable] - - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MariaDB 10 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, redis, pcntl, zip - ini-values: error_reporting=E_ALL - tools: composer:v2 - coverage: none - - - name: Install redis-cli - run: sudo apt-get install -qq redis-tools - - - name: Install dependencies - run: | - composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} - - - name: Execute tests - run: vendor/bin/pest - env: - DB_CONNECTION: mariadb - DB_DATABASE: pulse - DB_USERNAME: pulse - DB_PASSWORD: password - - pgsql: - runs-on: ubuntu-22.04 - - services: - postgresql: - image: postgres:14 - env: - POSTGRES_DB: pulse - POSTGRES_USER: pulse - POSTGRES_PASSWORD: password - ports: - - 5432:5432 - options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 - redis: - image: redis - ports: - - 6379:6379 - options: --entrypoint redis-server - - strategy: - fail-fast: true - matrix: - php: [8.3] - laravel: [11] - stability: [prefer-stable] - - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - PostgreSQL 14 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, redis, pcntl, zip - ini-values: error_reporting=E_ALL - tools: composer:v2 - coverage: none - - - name: Install redis-cli - run: sudo apt-get install -qq redis-tools - - - name: Install dependencies - run: | - composer require "illuminate/contracts=^${{ matrix.laravel }}" --dev --no-update - composer update --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/pest - env: - DB_CONNECTION: pgsql - DB_DATABASE: pulse - DB_USERNAME: pulse - DB_PASSWORD: password - sqlite: runs-on: ubuntu-22.04 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml deleted file mode 100644 index 1625bda1..00000000 --- a/.github/workflows/update-changelog.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: update changelog - -on: - release: - types: [released] - -jobs: - update: - uses: laravel/.github/.github/workflows/update-changelog.yml@main From f9c0d26711398287b23034fef1f7c358684e4f96 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:27:40 +1100 Subject: [PATCH 5/9] wip --- .github/workflows/tests.yml | 4 ++-- src/Support/RedisAdapter.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8151395..e7fd1465 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} - name: Execute tests - run: vendor/bin/pest + run: vendor/bin/pest -vvv env: DB_CONNECTION: sqlite @@ -139,7 +139,7 @@ jobs: composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} - name: Execute tests - run: vendor/bin/pest + run: vendor/bin/pest -vvv env: DB_CONNECTION: mysql DB_DATABASE: pulse diff --git a/src/Support/RedisAdapter.php b/src/Support/RedisAdapter.php index c6fcfd62..be787338 100644 --- a/src/Support/RedisAdapter.php +++ b/src/Support/RedisAdapter.php @@ -132,7 +132,7 @@ protected function run(array $args): mixed { return match (true) { $this->client() instanceof PhpRedis => $this->client()->rawCommand(...$args), - $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand('redis-node-0', ...$args), + $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(['redis-node-0', 6379], ...$args), $this->client() instanceof Predis, $this->client() instanceof Pipeline => $this->client()->executeCommand(RawCommand::create(...$args)), }; From 260810f8e2e5ca95837dca104c2c11ae240e997a Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:31:00 +1100 Subject: [PATCH 6/9] wip --- tests/Feature/RedisTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/Feature/RedisTest.php b/tests/Feature/RedisTest.php index 54b2894c..f61d3795 100644 --- a/tests/Feature/RedisTest.php +++ b/tests/Feature/RedisTest.php @@ -30,7 +30,7 @@ ]))); expect($commands)->toContain('"XADD" "laravel_database_laravel:pulse:ingest" "*" "data" "O:19:\"Laravel\\\\Pulse\\\\Entry\\":6:{s:15:\"\x00*\x00aggregations\";a:0:{}s:14:\"\x00*\x00onlyBuckets\";b:0;s:9:\"timestamp\";i:1700752211;s:4:\"type\";s:3:\"foo\";s:3:\"key\";s:3:\"bar\";s:5:\"value\";i:123;}"'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('keeps 7 days of data, by default, when trimming', function ($driver) { Config::set('database.redis.client', $driver); @@ -39,7 +39,7 @@ $commands = captureRedisCommands(fn () => App::make(RedisIngest::class)->trim()); expect($commands)->toContain('"XTRIM" "laravel_database_laravel:pulse:ingest" "MINID" "~" "946177445000"'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('can configure days of data to keep when trimming', function ($driver) { Config::set('database.redis.client', $driver); @@ -49,7 +49,7 @@ $commands = captureRedisCommands(fn () => App::make(RedisIngest::class)->trim()); expect($commands)->toContain('"XTRIM" "laravel_database_laravel:pulse:ingest" "MINID" "~" "946695845000"'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('can configure the number of entries to keep when trimming', function ($driver) { Config::set('database.redis.client', $driver); @@ -59,7 +59,7 @@ $commands = captureRedisCommands(fn () => App::make(RedisIngest::class)->trim()); expect($commands)->toContain('"XTRIM" "laravel_database_laravel:pulse:ingest" "MAXLEN" "~" "54321"'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('runs the same commands while storing', function ($driver) { Config::set('database.redis.client', $driver); @@ -80,7 +80,7 @@ expect($commands)->toContain('"XRANGE" "laravel_database_laravel:pulse:ingest" "-" "+" "COUNT" "567"'); expect($commands)->toContain('"XDEL" "laravel_database_laravel:pulse:ingest" "'.$firstEntryKey.'" "'.$lastEntryKey.'"'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('has consistent return for xadd', function ($driver) { Config::set('database.redis.client', $driver); @@ -96,7 +96,7 @@ expect($parts)->toHaveCount(2); expect($parts[0])->toEqualWithDelta(now()->getTimestampMs(), 50); expect($parts[1])->toBe('0'); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('has consistent return for xrange', function ($driver) { Config::set('database.redis.client', $driver); @@ -125,7 +125,7 @@ expect($parts[1])->toBeIn(['0', '1']); expect($value)->toBe(array_shift($values)); } -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('has consistent return for xtrim', function ($driver) { Config::set('database.redis.client', $driver); @@ -150,14 +150,14 @@ $result = $redis->xtrim('stream-name', 'MINID', '=', Str::before($lastKey, '-')); expect($result)->toBe(2); -})->with(['predis', 'phpredis']); +})->with(['phpredis']); it('throws exception on failure', function ($driver) { Config::set('database.redis.client', $driver); $redis = new RedisAdapter(Redis::connection(), App::make('config')); $redis->xtrim('stream-name', 'FOO', 'a', 'xyz'); -})->with(['predis', 'phpredis'])->throws(RedisServerException::class, 'The Redis version does not support the command or some of its arguments [XTRIM laravel_database_stream-name FOO a xyz]. Redis error: [ERR syntax error].'); +})->with(['phpredis'])->throws(RedisServerException::class, 'The Redis version does not support the command or some of its arguments [XTRIM laravel_database_stream-name FOO a xyz]. Redis error: [ERR syntax error].'); it('prepends the error message with the run command', function () { throw RedisServerException::whileRunningCommand('FOO BAR', 'Something happened'); From 924b4cdf1ffd328ed66097684d01db31d98d2844 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:48:01 +1100 Subject: [PATCH 7/9] wip --- src/Support/RedisAdapter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Support/RedisAdapter.php b/src/Support/RedisAdapter.php index be787338..761d8eba 100644 --- a/src/Support/RedisAdapter.php +++ b/src/Support/RedisAdapter.php @@ -132,7 +132,7 @@ protected function run(array $args): mixed { return match (true) { $this->client() instanceof PhpRedis => $this->client()->rawCommand(...$args), - $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(['redis-node-0', 6379], ...$args), + $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(['redis-node-5', 6379], ...$args), $this->client() instanceof Predis, $this->client() instanceof Pipeline => $this->client()->executeCommand(RawCommand::create(...$args)), }; From b8d5ff04b7a347d4320623bbc22b1bb42e87e94a Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 14:53:48 +1100 Subject: [PATCH 8/9] wip --- src/Support/RedisAdapter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Support/RedisAdapter.php b/src/Support/RedisAdapter.php index 761d8eba..afdd976e 100644 --- a/src/Support/RedisAdapter.php +++ b/src/Support/RedisAdapter.php @@ -132,7 +132,7 @@ protected function run(array $args): mixed { return match (true) { $this->client() instanceof PhpRedis => $this->client()->rawCommand(...$args), - $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(['redis-node-5', 6379], ...$args), + $this->client() instanceof PhpRedisCluster => $this->client()->rawCommand(['172.18.0.2', 6379], ...$args), $this->client() instanceof Predis, $this->client() instanceof Pipeline => $this->client()->executeCommand(RawCommand::create(...$args)), }; From 7c380d398a8da67e401d52d46229d812207fba16 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Mar 2024 15:53:39 +1100 Subject: [PATCH 9/9] wip --- tests/Feature/RedisTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Feature/RedisTest.php b/tests/Feature/RedisTest.php index f61d3795..a2e54c02 100644 --- a/tests/Feature/RedisTest.php +++ b/tests/Feature/RedisTest.php @@ -58,7 +58,9 @@ $commands = captureRedisCommands(fn () => App::make(RedisIngest::class)->trim()); - expect($commands)->toContain('"XTRIM" "laravel_database_laravel:pulse:ingest" "MAXLEN" "~" "54321"'); + $commands->dump(); + + expect($commands)->toContain('"172.18.0.2:6379", "XTRIM" "laravel_database_laravel:pulse:ingest" "MAXLEN" "~" "54321"'); })->with(['phpredis']); it('runs the same commands while storing', function ($driver) {