Skip to content

Commit

Permalink
fix(storage): reprobe and recalculate proposal (#1884)
Browse files Browse the repository at this point in the history
## Problem

The device selector allows going to iSCSI, zFCP and DASD pages in order
to activate/deactivate devices. But the system is not reprobed when
going back to the device selector.

## Solution

Add hook for reprobing and recalculating the storage proposal. The hook
is used by the proposal page and the device selector. Both components
are shown as loading meanwhile the reprobing is being done.

Note: The install button prevents to install if the system is
deprecated.

Note: This is a temporary solution. Dealing with deprecated system,
reprobing, etc should be done in a more realiable way after Agama 11.
  • Loading branch information
joseivanlopez authored Jan 10, 2025
2 parents 56781e5 + 75b30a8 commit e588602
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 24 deletions.
8 changes: 7 additions & 1 deletion service/lib/agama/dbus/storage/manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ def issues
private_constant :STORAGE_INTERFACE

def probe
busy_while { backend.probe }
busy_while do
# Clean trees in advance to avoid having old objects exported in D-Bus.
system_devices_tree.clean
staging_devices_tree.clean

backend.probe
end
end

# Applies the given serialized config according to the JSON schema.
Expand Down
7 changes: 7 additions & 0 deletions service/package/rubygem-agama-yast.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 15:44:30 UTC 2025 - José Iván López González <[email protected]>

- Objects from the D-Bus trees representing the storage devices are
removed before performing the probing. It prevents a segmentation
fault by accessing to old objects (gh#agama-project/agama#1884).

-------------------------------------------------------------------
Thu Jan 9 12:21:40 UTC 2025 - Knut Anderssen <[email protected]>

Expand Down
7 changes: 7 additions & 0 deletions web/package/agama-web-ui.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 15:56:35 UTC 2025 - José Iván López González <[email protected]>

- Add storage reprobing and recalculate proposal when going back to
either the proposal page or the devices selector if the system
is deprecated (gh#agama-project/agama#1884).

-------------------------------------------------------------------
Fri Jan 10 13:46:42 UTC 2025 - David Diaz <[email protected]>

Expand Down
8 changes: 3 additions & 5 deletions web/src/api/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ import { config } from "~/api/storage/types";
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const probe = (): Promise<any> => post("/api/storage/probe");

export { probe };

const fetchConfig = (): Promise<config.Config | undefined> =>
get("/api/storage/config").then((config) => config.storage);

Expand All @@ -57,8 +55,8 @@ const findStorageJob = (id: string): Promise<Job | undefined> =>
*/
const refresh = async (): Promise<void> => {
const settings = await fetchSettings();
await probe();
await calculate(settings);
await probe().catch(console.log);
await calculate(settings).catch(console.log);
};

export { fetchConfig, fetchStorageJobs, findStorageJob, refresh };
export { probe, fetchConfig, fetchStorageJobs, findStorageJob, refresh };
16 changes: 15 additions & 1 deletion web/src/components/storage/DeviceSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@ import { Page } from "~/components/core";
import { DeviceSelectorTable } from "~/components/storage";
import DevicesTechMenu from "./DevicesTechMenu";
import { ProposalTarget, StorageDevice } from "~/types/storage";
import { useAvailableDevices, useProposalMutation, useProposalResult } from "~/queries/storage";
import {
useAvailableDevices,
useProposalMutation,
useProposalResult,
useRefresh,
} from "~/queries/storage";
import { deviceChildren } from "~/components/storage/utils";
import { compact } from "~/utils";
import a11y from "@patternfly/react-styles/css/utilities/Accessibility/accessibility";
import { _ } from "~/i18n";
import { Loading } from "~/components/layout";

const SELECT_DISK_ID = "select-disk";
const CREATE_LVM_ID = "create-lvm";
Expand All @@ -53,11 +59,17 @@ export default function DeviceSelection() {
const availableDevices = useAvailableDevices();
const updateProposal = useProposalMutation();
const navigate = useNavigate();
const [isLoading, setIsLoading] = useState<boolean>(false);
const [state, setState] = useState<DeviceSelectionState>({});

const isTargetDisk = state.target === ProposalTarget.DISK;
const isTargetNewLvmVg = state.target === ProposalTarget.NEW_LVM_VG;

useRefresh({
onStart: () => setIsLoading(true),
onFinish: () => setIsLoading(false),
});

useEffect(() => {
if (state.target !== undefined) return;

Expand Down Expand Up @@ -118,6 +130,8 @@ physical volumes will be created on demand as new partitions at the selected \
devices.",
).split(/[[\]]/);

if (isLoading) return <Loading />;

return (
<Page>
<Page.Header>
Expand Down
6 changes: 6 additions & 0 deletions web/src/components/storage/ISCSIPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { Grid, GridItem } from "@patternfly/react-core";
import React from "react";
import { Page } from "~/components/core";
import { InitiatorSection, TargetsSection } from "~/components/storage/iscsi";
import { STORAGE as PATHS } from "~/routes/paths";
import { _ } from "~/i18n";

export default function ISCSIPage() {
Expand All @@ -42,6 +43,11 @@ export default function ISCSIPage() {
</GridItem>
</Grid>
</Page.Content>
<Page.Actions>
<Page.Action variant="secondary" navigateTo={PATHS.targetDevice}>
{_("Back to device selection")}
</Page.Action>
</Page.Actions>
</Page>
);
}
26 changes: 10 additions & 16 deletions web/src/components/storage/ProposalPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* find current contact information at www.suse.com.
*/

import React, { useRef } from "react";
import React, { useRef, useState } from "react";
import { Grid, GridItem, Stack } from "@patternfly/react-core";
import { Page, Drawer, EmptyState } from "~/components/core/";
import ProposalTransactionalInfo from "./ProposalTransactionalInfo";
Expand All @@ -35,16 +35,14 @@ import { useIssues } from "~/queries/issues";
import { IssueSeverity } from "~/types/issues";
import {
useAvailableDevices,
useDeprecated,
useDevices,
useProductParams,
useProposalMutation,
useProposalResult,
useVolumeDevices,
useVolumeTemplates,
useRefresh,
} from "~/queries/storage";
import { useQueryClient } from "@tanstack/react-query";
import { refresh } from "~/api/storage";

const StorageWarning = () => (
<Page>
Expand Down Expand Up @@ -96,16 +94,12 @@ export default function ProposalPage() {
const { encryptionMethods } = useProductParams({ suspense: true });
const proposal = useProposalResult();
const updateProposal = useProposalMutation();
const deprecated = useDeprecated();
const queryClient = useQueryClient();
const [isLoading, setIsLoading] = useState<boolean>(false);

React.useEffect(() => {
if (deprecated) {
refresh().then(() => {
queryClient.invalidateQueries({ queryKey: ["storage"] });
});
}
}, [deprecated, queryClient]);
useRefresh({
onStart: () => setIsLoading(true),
onFinish: () => setIsLoading(false),
});

const errors = useIssues("storage")
.filter((s) => s.severity === IssueSeverity.Error)
Expand Down Expand Up @@ -141,7 +135,7 @@ export default function ProposalPage() {
volumeTemplates={volumeTemplates}
settings={settings}
onChange={changeSettings}
isLoading={false}
isLoading={isLoading}
/>
</GridItem>
<GridItem sm={12} xl={6}>
Expand All @@ -162,14 +156,14 @@ export default function ProposalPage() {
// @ts-expect-error: we do not know how to specify the type of
// drawerRef properly and TS does not find the "open" property
onActionsClick={drawerRef.current?.open}
isLoading={false}
isLoading={isLoading}
/>
<ProposalResultSection
system={systemDevices}
staging={stagingDevices}
actions={actions}
errors={errors}
isLoading={false}
isLoading={isLoading}
/>
</Stack>
</Drawer>
Expand Down
29 changes: 28 additions & 1 deletion web/src/queries/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
} from "@tanstack/react-query";
import React from "react";
import { fetchDevices, fetchDevicesDirty } from "~/api/storage/devices";
import { fetchConfig } from "~/api/storage";
import { fetchConfig, refresh } from "~/api/storage";
import {
calculate,
fetchActions,
Expand Down Expand Up @@ -361,6 +361,32 @@ const useDeprecatedChanges = () => {
});
};

type RefreshHandler = {
onStart?: () => void;
onFinish?: () => void;
};

/**
* Hook that reprobes the devices and recalculates the proposal using the current settings.
*/
const useRefresh = (handler?: RefreshHandler) => {
const queryClient = useQueryClient();
const deprecated = useDeprecated();

handler ||= {};
handler.onStart ||= () => undefined;
handler.onFinish ||= () => undefined;

React.useEffect(() => {
if (!deprecated) return;

handler.onStart();
refresh()
.then(() => queryClient.invalidateQueries({ queryKey: ["storage"] }))
.then(() => handler.onFinish());
}, [handler, deprecated, queryClient]);
};

export {
useConfig,
useDevices,
Expand All @@ -372,4 +398,5 @@ export {
useProposalMutation,
useDeprecated,
useDeprecatedChanges,
useRefresh,
};

0 comments on commit e588602

Please sign in to comment.