|
21 | 21 |
|
22 | 22 | from sdcm import cluster
|
23 | 23 | from sdcm.remote import LOCALRUNNER
|
| 24 | +from sdcm.sct_events.database import DatabaseLogEvent |
| 25 | +from sdcm.sct_events.filters import DbEventsFilter |
24 | 26 | from sdcm.utils.docker_utils import get_docker_bridge_gateway, Container, ContainerManager, DockerException
|
25 | 27 | from sdcm.utils.health_checker import check_nodes_status
|
26 | 28 | from sdcm.utils.net import get_my_public_ip
|
@@ -162,8 +164,10 @@ def start_scylla(self, verify_up=True, verify_down=False, timeout=300):
|
162 | 164 | def stop_scylla_server(self, verify_up=False, verify_down=True, timeout=300, ignore_status=False):
|
163 | 165 | if verify_up:
|
164 | 166 | self.wait_db_up(timeout=timeout)
|
165 |
| - self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl stop scylla"), |
166 |
| - timeout=timeout) |
| 167 | + # ignoring WARN messages upon stopping - https://github.com/scylladb/scylla-cluster-tests/issues/10633 |
| 168 | + with DbEventsFilter(db_event=DatabaseLogEvent.BACKTRACE, line="WARN "): |
| 169 | + self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl stop scylla"), |
| 170 | + timeout=timeout) |
167 | 171 | if verify_down:
|
168 | 172 | self.wait_db_down(timeout=timeout)
|
169 | 173 |
|
@@ -192,7 +196,9 @@ def restart_scylla_server(self, verify_up_before=False, verify_up_after=True, ti
|
192 | 196 | # Need to restart the scylla-housekeeping service manually because of autostart of this service is disabled
|
193 | 197 | # for the docker backend. See, for example, docker/scylla-sct/ubuntu/Dockerfile
|
194 | 198 | self.stop_scylla_housekeeping_service(timeout=timeout)
|
195 |
| - self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl restart scylla"), timeout=timeout) |
| 199 | + # ignoring WARN messages upon stopping - https://github.com/scylladb/scylla-cluster-tests/issues/10633 |
| 200 | + with DbEventsFilter(db_event=DatabaseLogEvent.BACKTRACE, line="WARN "): |
| 201 | + self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl restart scylla"), timeout=timeout) |
196 | 202 | if verify_up_after:
|
197 | 203 | self.wait_db_up(timeout=verify_up_timeout)
|
198 | 204 | self.start_scylla_housekeeping_service(timeout=timeout)
|
|
0 commit comments