Skip to content
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

SHUTDOWN - add support for the new NOW, FORCE and ABORT modifiers #2150

Merged
merged 7 commits into from
Jun 1, 2022
Merged
Changes from 1 commit
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
43 changes: 37 additions & 6 deletions redis/commands/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1080,12 +1080,25 @@ def save(self, **kwargs) -> ResponseT:
"""
return self.execute_command("SAVE", **kwargs)

def shutdown(self, save: bool = False, nosave: bool = False, **kwargs) -> None:
def shutdown(
self,
save: bool = False,
nosave: bool = False,
now: bool = False,
force: bool = False,
abort: bool = False,
**kwargs,
) -> None:
"""Shutdown the Redis server. If Redis has persistence configured,
data will be flushed before shutdown. If the "save" option is set,
a data flush will be attempted even if there is no persistence
configured. If the "nosave" option is set, no data flush will be
attempted. The "save" and "nosave" options cannot both be set.
data will be flushed before shutdown.
It is possible to specify modifiers to alter the behavior of the command:
``save`` will force a DB saving operation even if no save points are configured.
``nosave`` will prevent a DB saving operation even if one or more save points
are configured.
``now`` skips waiting for lagging replicas, i.e. it bypasses the first step in
the shutdown sequence.
``force`` ignores any errors that would normally prevent the server from exiting
``abort`` cancels an ongoing shutdown and cannot be combined with other flags.

For more information see https://redis.io/commands/shutdown
"""
Expand All @@ -1096,6 +1109,12 @@ def shutdown(self, save: bool = False, nosave: bool = False, **kwargs) -> None:
args.append("SAVE")
if nosave:
args.append("NOSAVE")
if now:
args.append("NOW")
if force:
args.append("FORCE")
if abort:
args.append("ABORT")
try:
self.execute_command(*args, **kwargs)
except ConnectionError:
Expand Down Expand Up @@ -1206,7 +1225,13 @@ async def memory_help(self, **kwargs) -> None:
return super().memory_help(**kwargs)

async def shutdown(
self, save: bool = False, nosave: bool = False, **kwargs
self,
save: bool = False,
nosave: bool = False,
now: bool = False,
force: bool = False,
abort: bool = False,
**kwargs,
) -> None:
"""Shutdown the Redis server. If Redis has persistence configured,
data will be flushed before shutdown. If the "save" option is set,
Expand All @@ -1223,6 +1248,12 @@ async def shutdown(
args.append("SAVE")
if nosave:
args.append("NOSAVE")
if now:
args.append("NOW")
if force:
args.append("FORCE")
if abort:
args.append("ABORT")
try:
await self.execute_command(*args, **kwargs)
except ConnectionError:
Expand Down