Skip to content

Fixing muted SQS tests #1234

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.

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
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .github/config/muted_ya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ ydb/tests/functional/clickbench test.py.test_run_*column]
ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
ydb/tests/functional/postgresql test_postgres.py.TestPostgresSuite.test_postgres_suite*
ydb/tests/functional/restarts test_restarts.py.*
ydb/tests/functional/sqs/cloud test_yandex_cloud_mode.py.TestSqsYandexCloudMode.test_dlq_mechanics_in_cloud*
ydb/tests/functional/sqs/cloud test_yandex_cloud_queue_counters.py.TestYmqQueueCounters.test_purge_queue_counters
ydb/tests/functional/sqs/common test_queue_counters.py.TestSqsGettingCounters.test_purge_queue_counters
ydb/tests/functional/sqs/large test_leader_start_inflight.py.TestSqsMultinodeCluster.test_limit_leader_start_inflight[tables_format*]
ydb/tests/functional/sqs/large [*/10]*
ydb/tests/functional/sqs/merge_split_common_table/fifo *
ydb/tests/functional/sqs/merge_split_common_table/std *
ydb/tests/functional/tenants test_dynamic_tenants.py.*
Expand Down
15 changes: 10 additions & 5 deletions ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,13 +487,18 @@ def get_messages_count(queue_url):
delete_result, not_none()
)

# shouldn't get any error
result_list = self._read_single_message_no_wait(queue1_url)
assert len(result_list) == 0 or result_list[0]['Body'] == msg_body
# waiting until the message appears in queue1 again
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Проблема была в том, что self._read_single_message_no_wait(queue1_url) могла прочитать как 1, так и 0 сообщений. Тесть падал, когда вычитвалось 1. Фикс - читать, дожидаясь этого сообщения.

result_list = self._read_while_not_empty(
queue_url = queue1_url,
messages_count=1,
visibility_timeout=0,
wait_timeout=10
)
assert_that(result_list[0]['Body'], equal_to(msg_body))

# ok, getting the message again
# getting the message until it's moved to dlq
for i in range(max_receive_count):
assert_that(self._read_single_message_no_wait(queue1_url)[0]['Body'], equal_to(msg_body))
self._read_single_message_no_wait(queue1_url)

# check moved messages counter
counters = self._get_sqs_counters(counters_format='text')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,13 @@ def test_purge_queue_counters(self):
queue_url = self._sqs_api.create_queue(self.queue_name)
queue_resource_id = self._get_queue_resource_id(queue_url, self.queue_name)

self._sqs_api.send_message(queue_url, "foo")
self._sqs_api.purge_queue(queue_url)

self._sqs_api.send_message(queue_url, "bar")
self._sqs_api.purge_queue(queue_url)
for _ in range(20):
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Очень редко счётчик успевал упасть до 0. Опытным путём выяснилось, что 20 после таких итераций счётчик будет точно больше 0, а точного значения тут на самом деле и не нужно.

self._sqs_api.send_message(queue_url, "foobar")
self._sqs_api.purge_queue(queue_url)

ymq_counters = self._get_ymq_counters(cloud=self.cloud_id, folder=self.folder_id)
purged_derivative = self._get_counter_value(ymq_counters, {
'queue': queue_resource_id,
'name': 'queue.messages.purged_count_per_second',
})
assert purged_derivative == 1
assert purged_derivative > 0
9 changes: 4 additions & 5 deletions ydb/tests/functional/sqs/common/test_queue_counters.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,15 @@ def test_receive_message_immediate_duration_counter(self):

def test_purge_queue_counters(self):
queue_url = self._create_queue_and_assert(self.queue_name, False, True)
self._sqs_api.send_message(queue_url, "foo")
self._sqs_api.purge_queue(queue_url)

self._sqs_api.send_message(queue_url, "bar")
self._sqs_api.purge_queue(queue_url)
for _ in range(20):
self._sqs_api.send_message(queue_url, "foobar")
self._sqs_api.purge_queue(queue_url)

sqs_counters = self._get_sqs_counters()

purged_derivative = self._get_counter_value(sqs_counters, {
'queue': self.queue_name,
'sensor': 'MessagesPurged',
})
assert purged_derivative == 1
assert purged_derivative > 0
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_limit_leader_start_inflight(self, is_fifo, tables_format):
self._init_with_params(is_fifo, tables_format)

queues = []
for i in range(100):
for i in range(20):
queues.append(self._create_queue_and_assert(f'{i}_{self.queue_name}', is_fifo=is_fifo))

def send_messages():
Expand Down