Skip to content

Revert "Reduce Redis key size" #374

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

Open
ChrisBr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Reduce Redis key size" #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ruby/lib/ci/queue/redis.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
require 'ci/queue/redis/supervisor'
require 'ci/queue/redis/grind_supervisor'
require 'ci/queue/redis/test_time_record'
require 'ci/queue/redis/key_shortener'

module CI
module Queue
Expand Down
2 changes: 1 addition & 1 deletion ruby/lib/ci/queue/redis/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def measure
end

def key(*args)
KeyShortener.key(config.build_id, *args)
['build', build_id, *args].join(':')
end

def build_id
Expand Down
2 changes: 1 addition & 1 deletion ruby/lib/ci/queue/redis/build_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def record_stats(stats, pipeline: redis)
end

def key(*args)
KeyShortener.key(config.build_id, *args)
['build', config.build_id, *args].join(':')
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion ruby/lib/ci/queue/redis/grind_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def pop_warnings
attr_reader :redis, :config

def key(*args)
KeyShortener.key(config.build_id, *args)
['build', config.build_id, *args].join(':')
end

def record_stats(stats, pipeline: redis)
Expand Down
53 changes: 0 additions & 53 deletions ruby/lib/ci/queue/redis/key_shortener.rb
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ruby/test/ci/queue/redis_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ def test_acknowledge_returns_false_if_the_test_was_picked_up_by_another_worker
end

def test_workers_register
assert_equal 1, @redis.scard(CI::Queue::Redis::KeyShortener.key('42', 'workers'))
assert_equal 1, @redis.scard(('build:42:workers'))
worker(2)
assert_equal 2, @redis.scard(CI::Queue::Redis::KeyShortener.key('42', 'workers'))
assert_equal 2, @redis.scard(('build:42:workers'))
end

def test_timeout_warning
Expand Down
4 changes: 2 additions & 2 deletions ruby/test/integration/minitest_redis_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def test_debug_log
)
end

assert_includes File.read(log_file.path), 'INFO -- : Finished \'["exists", "b:c4ca4238:w:1:q"]\': 0'
assert_includes File.read(log_file.path), 'INFO -- : Finished \'["exists", "build:1:worker:1:queue"]\': 0'
assert_empty err
result = normalize(out.lines.last.strip)
assert_equal '--- Ran 11 tests, 8 assertions, 2 failures, 1 errors, 1 skips, 4 requeues in X.XXs', result
Expand Down Expand Up @@ -444,7 +444,7 @@ def test_retry_fails_when_test_run_is_expired
assert_equal 'Ran 100 tests, 100 assertions, 0 failures, 0 errors, 0 skips, 0 requeues in X.XXs', output

one_day = 60 * 60 * 24
key = CI::Queue::Redis::KeyShortener.key("1", "created-at")
key = ['build', "1", "created-at"].join(':')
@redis.set(key, Time.now - one_day)

out, err = capture_subprocess_io do
Expand Down
Loading