Skip to content

[GSK-1813] Fix giskard server upgrade runs for 20mns without returning #1474

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

Merged
merged 2 commits into from
Oct 11, 2023
Merged

[GSK-1813] Fix giskard server upgrade runs for 20mns without returning #1474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1160dab
Provide a default server ver from client ver
Inokinoki Oct 11, 2023
a4b5625
Handle upgrade without settings file
Inokinoki Oct 11, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions giskard/commands/cli_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ def _fetch_latest_tag() -> str:
latest_tag = "latest"
latest = next(i for i in json_response["results"] if i["name"] == latest_tag)
latest_version_image = next(
i for i in json_response["results"] if ((i["name"] != latest_tag) and (i["digest"] == latest["digest"]))
(i for i in json_response["results"] if ((i["name"] != latest_tag) and (i["digest"] == latest["digest"]))),
{ "name": giskard.__version__ } # Create a dictionary containing the current version as default value
)

tag = latest_version_image["name"]
Expand Down Expand Up @@ -451,14 +452,17 @@ def upgrade(version):
if not version:
version = latest_version

installed_version = _get_settings().get("version")
installed_version = _get_settings().get("version") if _get_settings() else None
if installed_version == version:
logger.info(f"Giskard server is already running version {version}")
return

logger.info(f"Updating Giskard Server {installed_version} -> {version}")
_pull_image(version)
_write_settings({**_get_settings(), **{"version": version}})
if _get_settings():
_write_settings({**_get_settings(), **{"version": version}})
else:
_write_settings({**{"version": version}})
logger.info(f"Giskard Server upgraded to {version}")


Expand Down