Skip to content
Merged
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
12 changes: 9 additions & 3 deletions sdcm/cluster_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

from sdcm import cluster
from sdcm.remote import LOCALRUNNER
from sdcm.sct_events.database import DatabaseLogEvent
from sdcm.sct_events.filters import DbEventsFilter
from sdcm.utils.docker_utils import get_docker_bridge_gateway, Container, ContainerManager, DockerException
from sdcm.utils.health_checker import check_nodes_status
from sdcm.utils.net import get_my_public_ip
Expand Down Expand Up @@ -162,8 +164,10 @@ def start_scylla(self, verify_up=True, verify_down=False, timeout=300):
def stop_scylla_server(self, verify_up=False, verify_down=True, timeout=300, ignore_status=False):
if verify_up:
self.wait_db_up(timeout=timeout)
self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl stop scylla"),
timeout=timeout)
# ignoring WARN messages upon stopping - https://github.com/scylladb/scylla-cluster-tests/issues/10633
with DbEventsFilter(db_event=DatabaseLogEvent.BACKTRACE, line="WARN "):
self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl stop scylla"),
timeout=timeout)
if verify_down:
self.wait_db_down(timeout=timeout)

Expand Down Expand Up @@ -192,7 +196,9 @@ def restart_scylla_server(self, verify_up_before=False, verify_up_after=True, ti
# Need to restart the scylla-housekeeping service manually because of autostart of this service is disabled
# for the docker backend. See, for example, docker/scylla-sct/ubuntu/Dockerfile
self.stop_scylla_housekeeping_service(timeout=timeout)
self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl restart scylla"), timeout=timeout)
# ignoring WARN messages upon stopping - https://github.com/scylladb/scylla-cluster-tests/issues/10633
with DbEventsFilter(db_event=DatabaseLogEvent.BACKTRACE, line="WARN "):
self.remoter.sudo('sh -c "{0} || {0}-server"'.format("supervisorctl restart scylla"), timeout=timeout)
if verify_up_after:
self.wait_db_up(timeout=verify_up_timeout)
self.start_scylla_housekeeping_service(timeout=timeout)
Expand Down
Loading