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

fix: remove bulk instance migration feature due to server loading concerns #869

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
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
27 changes: 0 additions & 27 deletions src/api/instances.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,6 @@ export const migrateInstance = (
});
};

export const migrateInstanceBulk = (
instances: LxdInstance[],
eventQueue: EventQueue,
target: string,
): Promise<PromiseSettledResult<void>[]> => {
const results: PromiseSettledResult<void>[] = [];
return new Promise((resolve) => {
void Promise.allSettled(
instances.map((instance) => {
return migrateInstance(instance.name, instance.project, target)
.then((operation) => {
eventQueue.set(
operation.metadata.id,
() => pushSuccess(results),
(msg) => pushFailure(results, msg),
() => continueOrFinish(results, instances.length, resolve),
);
})
.catch((e) => {
pushFailure(results, e instanceof Error ? e.message : "");
continueOrFinish(results, instances.length, resolve);
});
}),
);
});
};

export const startInstance = (
instance: LxdInstance,
): Promise<LxdOperationResponse> => {
Expand Down
12 changes: 0 additions & 12 deletions src/pages/instances/InstanceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ import { LxdInstanceStatus } from "types/instance";
import useSortTableData from "util/useSortTableData";
import PageHeader from "components/PageHeader";
import InstanceDetailPanel from "./InstanceDetailPanel";
import { useSettings } from "context/useSettings";
import { isClusteredServer } from "util/settings";
import BulkMigrateInstanceBtn from "./actions/BulkMigrateInstanceBtn";

const loadHidden = () => {
const saved = localStorage.getItem("instanceListHiddenColumns");
Expand All @@ -82,8 +79,6 @@ const InstanceList: FC = () => {
const [createButtonLabel, _setCreateButtonLabel] =
useState<string>("Create instance");
const [searchParams] = useSearchParams();
const { data: settings } = useSettings();
const isClustered = isClusteredServer(settings);

const filters: InstanceFilters = {
queries: searchParams.getAll("query"),
Expand Down Expand Up @@ -524,13 +519,6 @@ const InstanceList: FC = () => {
onStart={() => setProcessingNames(selectedNames)}
onFinish={() => setProcessingNames([])}
/>
{isClustered ? (
<BulkMigrateInstanceBtn
instances={selectedInstances}
onStart={() => setProcessingNames(selectedNames)}
onFinish={() => setProcessingNames([])}
/>
) : null}
<InstanceBulkDelete
instances={selectedInstances}
onStart={setProcessingNames}
Expand Down
36 changes: 17 additions & 19 deletions src/pages/instances/MigrateInstanceModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,30 @@ import { useQuery } from "@tanstack/react-query";
import { queryKeys } from "util/queryKeys";
import { fetchClusterMembers } from "api/cluster";
import Loader from "components/Loader";
import { pluralize } from "util/instanceBulkActions";
import { getValidInstancesForMigration } from "util/instanceMigrate";
import ScrollableTable from "components/ScrollableTable";

interface Props {
close: () => void;
migrate: (target: string, instances: LxdInstance[]) => void;
instances: LxdInstance[];
migrate: (target: string, instance: LxdInstance) => void;
instance: LxdInstance;
}

const MigrateInstanceModal: FC<Props> = ({ close, migrate, instances }) => {
const MigrateInstanceModal: FC<Props> = ({ close, migrate, instance }) => {
const { data: members = [], isLoading } = useQuery({
queryKey: [queryKeys.cluster, queryKeys.members],
queryFn: fetchClusterMembers,
});

const [selectedMember, setSelectedMember] = useState("");

const isBulkMigration = instances.length > 1;

const handleEscKey = (e: KeyboardEvent<HTMLElement>) => {
if (e.key === "Escape") {
close();
}
};

const handleMigrate = (instances: LxdInstance[]) => {
migrate(selectedMember, instances);
const handleMigrate = (instance: LxdInstance) => {
migrate(selectedMember, instance);
close();
};

Expand All @@ -60,7 +56,7 @@ const MigrateInstanceModal: FC<Props> = ({ close, migrate, instances }) => {

const rows = members.map((member) => {
const disableReason =
!isBulkMigration && member.server_name === instances[0].location
member.server_name === instance.location
? "Instance already running on this member"
: "";

Expand Down Expand Up @@ -138,13 +134,15 @@ const MigrateInstanceModal: FC<Props> = ({ close, migrate, instances }) => {

const modalTitle = selectedMember
? "Confirm migration"
: isBulkMigration
? `Choose target cluster member for ${instances.length} selected ${pluralize("instance", instances.length)}`
: `Choose target cluster member for instance ${instances[0].name}`;

const { summary, validInstances } = getValidInstancesForMigration(
instances,
selectedMember,
: `Choose target cluster member for instance ${instance.name}`;

const summary = (
<div className="migrate-instance-summary">
<p>
This will migrate instance <strong>{instance.name}</strong> to cluster
member <b>{selectedMember}</b>.
</p>
</div>
);

return (
Expand All @@ -166,8 +164,8 @@ const MigrateInstanceModal: FC<Props> = ({ close, migrate, instances }) => {
<ActionButton
appearance="positive"
className="u-no-margin--bottom"
onClick={() => handleMigrate(validInstances)}
disabled={!selectedMember || !validInstances.length}
onClick={() => handleMigrate(instance)}
disabled={!selectedMember}
>
Migrate
</ActionButton>
Expand Down
108 changes: 0 additions & 108 deletions src/pages/instances/actions/BulkMigrateInstanceBtn.tsx

This file was deleted.

48 changes: 22 additions & 26 deletions src/pages/instances/actions/MigrateInstanceBtn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { LxdInstance } from "types/instance";
import { useInstanceLoading } from "context/instanceLoading";
import MigrateInstanceModal from "../MigrateInstanceModal";
import classNames from "classnames";
import { isClusteredServer } from "util/settings";
import { useSettings } from "context/useSettings";
import { isClusteredServer } from "util/settings";

interface Props {
instance: LxdInstance;
Expand Down Expand Up @@ -93,33 +93,29 @@ const MigrateInstanceBtn: FC<Props> = ({

const isDisabled = isLoading || !!instanceLoading.getType(instance);

return (
return isClustered ? (
<>
{isClustered ? (
<>
{isOpen && (
<Portal>
<MigrateInstanceModal
close={handleClose}
migrate={handleMigrate}
instances={[instance]}
/>
</Portal>
)}
<ActionButton
onClick={openPortal}
type="button"
className={classNames("instance-migrate", classname)}
loading={isLoading}
disabled={isDisabled}
aria-label={`Migrate instance ${instance.name}`}
>
<span>Migrate</span>
</ActionButton>
</>
) : null}
{isOpen && (
<Portal>
<MigrateInstanceModal
close={handleClose}
migrate={handleMigrate}
instance={instance}
/>
</Portal>
)}
<ActionButton
onClick={openPortal}
type="button"
className={classNames("instance-migrate", classname)}
loading={isLoading}
disabled={isDisabled}
aria-label={`Migrate instance ${instance.name}`}
>
<span>Migrate</span>
</ActionButton>
</>
);
) : null;
};

export default MigrateInstanceBtn;
Loading
Loading