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.

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

fix(storage): recover config if needed #1848

Merged
merged 3 commits into from
Dec 20, 2024
Merged

fix(storage): recover config if needed #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06b7d08
storage: add client methods to work with config
joseivanlopez Dec 20, 2024
78938b6
storage: recover config if needed
joseivanlopez Dec 20, 2024
427873a
service: changelog
joseivanlopez Dec 20, 2024
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
17 changes: 17 additions & 0 deletions service/lib/agama/dbus/clients/storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
require "agama/dbus/clients/with_locale"
require "agama/dbus/clients/with_progress"
require "agama/dbus/clients/with_issues"
require "json"

module Agama
module DBus
Expand Down Expand Up @@ -62,6 +63,22 @@ def finish
dbus_object.Finish
end

# Gets the current storage config.
#
# @return [Hash]
def config
serialized_config = dbus_object.GetConfig
JSON.parse(serialized_config, symbolize_names: true)
end

# Sets the storage config.
#
# @param config [Hash]
def config=(config)
serialized_config = JSON.pretty_generate(config)
dbus_object.SetConfig(serialized_config)
end

private

# @return [::DBus::Object]
Expand Down
43 changes: 27 additions & 16 deletions service/lib/agama/manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,30 +83,19 @@ def startup_phase
service_status.idle
end

def locale=(locale)
service_status.busy
change_process_locale(locale)
users.update_issues
start_progress_with_descriptions(
_("Load software translations"),
_("Load storage translations")
)
progress.step { software.locale = locale }
progress.step { storage.locale = locale }
ensure
service_status.idle
finish_progress
end

# Runs the config phase
def config_phase
service_status.busy
first_time = installation_phase.startup?
installation_phase.config

start_progress_with_descriptions(
_("Analyze disks"), _("Configure software")
)
progress.step { storage.probe }
# FIXME: hot-fix for bsc#1234711, see {#probe_and_recover_storage}. In autoinstallation, the
# storage config could be applied before probing. In that case, the config has to be
# recovered.
progress.step { first_time ? probe_and_recover_storage : storage.probe }
progress.step { software.probe }

logger.info("Config phase done")
Expand Down Expand Up @@ -159,6 +148,21 @@ def install_phase
end
# rubocop:enable Metrics/AbcSize

def locale=(locale)
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for moving this. I always think that it is misplaced, but I never fix it.

service_status.busy
change_process_locale(locale)
users.update_issues
start_progress_with_descriptions(
_("Load software translations"),
_("Load storage translations")
)
progress.step { software.locale = locale }
progress.step { storage.locale = locale }
ensure
service_status.idle
finish_progress
end

# Software client
#
# @return [DBus::Clients::Software]
Expand Down Expand Up @@ -273,5 +277,12 @@ def iguana?

# @return [ServiceStatusRecorder]
attr_reader :service_status_recorder

# Probes storage and recover the current config, if any.
def probe_and_recover_storage
storage_config = storage.config
storage.probe
storage.config = storage_config unless storage_config.empty?
end
end
end
6 changes: 6 additions & 0 deletions service/package/rubygem-agama-yast.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 20 15:05:11 UTC 2024 - José Iván López González <jlopez@suse.com>

- Hotfix to avoid losing the storage config with auto installation
(bsc#1234711).

-------------------------------------------------------------------
Fri Dec 20 12:18:56 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

Expand Down
Loading