StoragePool and StorageSystem changes for new 2 Nodes+Arbiter cluster

When we detect a 2 Nodes + 1 Arbiter cluster, we should only show,
'2-way Replication' in 'Data protection policy' list

How is '2 Nodes + 1 Arbiter' cluster detected?
There is an entry in 'Infrastructure' CR's `controlPlaneTopology` status,
value should be `HighlyAvailableArbiter`.

Added changes for 'StorageSystem' creation steps.

Signed-off-by: Arun Kumar Mohan <[email protected]>

Author: aruniiird

locales/en/plugin__odf-console.json

@@ -132,7 +132,7 @@
   "A Local Volume Set allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.": "A Local Volume Set allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.",
   "A LocalVolumeSet will be created to allow you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.": "A LocalVolumeSet will be created to allow you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.",
   "A method is required.": "A method is required.",
-  "A minimum of 3 nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.": "A minimum of 3 nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.",
+  "A minimum of {{minNodes}} nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.": "A minimum of {{minNodes}} nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.",
   "A mirror peer configuration already exists for one or more of the selected clusters, either from an existing or deleted DR policy. To create a new DR policy with these clusters, delete any existing mirror peer configurations associated with them and try again.": "A mirror peer configuration already exists for one or more of the selected clusters, either from an existing or deleted DR policy. To create a new DR policy with these clusters, delete any existing mirror peer configurations associated with them and try again.",
   "A namespace controls access to the OBC and ties the buckets to a specific project.": "A namespace controls access to the OBC and ties the buckets to a specific project.",
   "A PEM-encoded CA certificate file used to verify the Vault server's SSL certificate.": "A PEM-encoded CA certificate file used to verify the Vault server's SSL certificate.",
@@ -1821,6 +1821,7 @@
   "This selection determines the storage capabilities of your cluster. Once configured it cannot be changed.": "This selection determines the storage capabilities of your cluster. Once configured it cannot be changed.",
   "This selection is exclusive and cannot be used with other device types.": "This selection is exclusive and cannot be used with other device types.",
   "This selection will delete current and all previous versions of the object from the bucket permanently. This object will be lost forever and cannot be restored.": "This selection will delete current and all previous versions of the object from the bucket permanently. This object will be lost forever and cannot be restored.",
+  "This setup spans across 3 zones with 2 data nodes and 1 arbiter. The arbiter maintains quorum without storing data. This setup uses replica-2, which tolerates only one node failure; data loss can occur if multiple nodes fail. Review your failure domain and recovery plan before proceeding.": "This setup spans across 3 zones with 2 data nodes and 1 arbiter. The arbiter maintains quorum without storing data. This setup uses replica-2, which tolerates only one node failure; data loss can occur if multiple nodes fail. Review your failure domain and recovery plan before proceeding.",
   "This status is shown exclusively for default storage classes.": "This status is shown exclusively for default storage classes.",
   "This token is for one-time use only and is valid for 48 hours.": "This token is for one-time use only and is valid for 48 hours.",
   "This URL is used to access and manage secrets, keys, and certificates stored in Azure Key Vault.": "This URL is used to access and manage secrets, keys, and certificates stored in Azure Key Vault.",

packages/ocs/storage-pool/body.tsx

@@ -2,19 +2,23 @@ import * as React from 'react';
 import { AttachStorageAction } from '@odf/core/components/attach-storage-storagesystem/state';
 import { checkArbiterCluster } from '@odf/core/utils';
 import {
+  DEFAULT_INFRASTRUCTURE,
   fieldRequirementsTranslations,
   formSettings,
 } from '@odf/shared/constants';
 import { useK8sGet } from '@odf/shared/hooks';
 import { TextInputWithFieldRequirements } from '@odf/shared/input-with-requirements';
-import { StorageClusterModel } from '@odf/shared/models';
+import { InfrastructureModel, StorageClusterModel } from '@odf/shared/models';
 import { getNamespace } from '@odf/shared/selectors';
 import {
+  InfraTopologyMode,
+  InfrastructureKind,
   ListKind,
   StorageClusterKind,
   CephClusterKind,
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
+import { getInfrastructureControlPlaneTopology } from '@odf/shared/utils';
 import validationRegEx from '@odf/shared/utils/validation';
 import { useYupValidationResolver } from '@odf/shared/yup-validation-resolver';
 import {
@@ -83,6 +87,12 @@ export const StoragePoolStatus: React.FC<StoragePoolStatusProps> = ({
   );
 };
 
+export const isTwoNodePlusArbiterTopology = (
+  infra: InfrastructureKind
+): boolean =>
+  getInfrastructureControlPlaneTopology(infra) ===
+  InfraTopologyMode.HighlyAvailableArbiter;
+
 export type StoragePoolStatusProps = {
   status: string;
   name?: string;
@@ -125,6 +135,9 @@ export const StoragePoolBody: React.FC<StoragePoolBodyProps> = ({
   const [storageCluster, storageClusterLoaded, storageClusterLoadError] =
     useK8sGet<ListKind<StorageClusterKind>>(StorageClusterModel, null, poolNs);
 
+  const [infrastructure, infrastructureLoaded, infrastructureError] =
+    useK8sGet<InfrastructureKind>(InfrastructureModel, DEFAULT_INFRASTRUCTURE);
+
   const [isReplicaOpen, setReplicaOpen] = React.useState(false);
 
   const poolNameMaxLength = 253;
@@ -188,6 +201,15 @@ export const StoragePoolBody: React.FC<StoragePoolBodyProps> = ({
     });
   }, [poolName, dispatch, errors?.newPoolName, prefixName, usePrefix]);
 
+  // TwoNodeOneArbiterCluster detection
+  React.useEffect(() => {
+    if (infrastructureLoaded && !infrastructureError)
+      dispatch({
+        type: StoragePoolActionType.SET_POOL_TWO_NODE_ONE_ARBITER,
+        payload: isTwoNodePlusArbiterTopology(infrastructure),
+      });
+  }, [infrastructure, infrastructureLoaded, infrastructureError, dispatch]);
+
   // Failure Domain
   React.useEffect(() => {
     if (storageClusterLoaded && !storageClusterLoadError)
@@ -225,9 +247,15 @@ export const StoragePoolBody: React.FC<StoragePoolBodyProps> = ({
   ]);
 
   const replicaList: string[] = _.keys(OCS_DEVICE_REPLICA).filter(
-    (replica: string) =>
-      (state.isArbiterCluster && replica === '4') ||
-      (!state.isArbiterCluster && replica !== '4')
+    (replica: string) => {
+      if (state.isTwoNodeOneArbiterCluster) {
+        return replica === '2';
+      } else if (state.isArbiterCluster) {
+        return replica === '4';
+      } else {
+        return replica !== '4';
+      }
+    }
   );
 
   const replicaDropdownItems = replicaList.map((replica) => {

packages/ocs/storage-pool/reducer.ts

@@ -4,6 +4,7 @@ export type StoragePoolState = {
   replicaSize: string;
   isCompressed: boolean;
   isArbiterCluster: boolean;
+  isTwoNodeOneArbiterCluster: boolean;
   failureDomain: string;
   inProgress: boolean;
   errorMessage: string;
@@ -15,6 +16,7 @@ export enum StoragePoolActionType {
   SET_POOL_REPLICA_SIZE = 'SET_POOL_REPLICA_SIZE',
   SET_POOL_COMPRESSED = 'SET_POOL_COMPRESSED',
   SET_POOL_ARBITER = 'SET_POOL_ARBITER',
+  SET_POOL_TWO_NODE_ONE_ARBITER = 'SET_POOL_TWO_NODE_ONE_ARBITER',
   SET_FAILURE_DOMAIN = 'SET_FAILURE_DOMAIN',
   SET_INPROGRESS = 'SET_INPROGRESS',
   SET_ERROR_MESSAGE = 'SET_ERROR_MESSAGE',
@@ -26,6 +28,7 @@ export const blockPoolInitialState: StoragePoolState = {
   replicaSize: '',
   isCompressed: false,
   isArbiterCluster: false,
+  isTwoNodeOneArbiterCluster: false,
   failureDomain: '',
   inProgress: false,
   errorMessage: '',
@@ -37,6 +40,10 @@ export type StoragePoolAction =
   | { type: StoragePoolActionType.SET_POOL_REPLICA_SIZE; payload: string }
   | { type: StoragePoolActionType.SET_POOL_COMPRESSED; payload: boolean }
   | { type: StoragePoolActionType.SET_POOL_ARBITER; payload: boolean }
+  | {
+      type: StoragePoolActionType.SET_POOL_TWO_NODE_ONE_ARBITER;
+      payload: boolean;
+    }
   | { type: StoragePoolActionType.SET_FAILURE_DOMAIN; payload: string }
   | { type: StoragePoolActionType.SET_INPROGRESS; payload: boolean }
   | { type: StoragePoolActionType.SET_ERROR_MESSAGE; payload: string };
@@ -76,6 +83,12 @@ export const storagePoolReducer = (
         isArbiterCluster: action.payload,
       };
     }
+    case StoragePoolActionType.SET_POOL_TWO_NODE_ONE_ARBITER: {
+      return {
+        ...state,
+        isTwoNodeOneArbiterCluster: action.payload,
+      };
+    }
     case StoragePoolActionType.SET_FAILURE_DOMAIN: {
       return {
         ...state,

packages/odf/components/create-storage-system/create-steps.tsx

@@ -21,6 +21,7 @@ export const createSteps = (
   state: WizardState,
   dispatch: WizardDispatch,
   infraType: InfraProviders,
+  hasTwoNodesOneArbiter: boolean,
   hasOCS: boolean,
   supportedExternalStorage: ExternalStorage[],
   hasMultipleClusters: boolean
@@ -48,6 +49,7 @@ export const createSteps = (
         <CapacityAndNodes
           dispatch={dispatch}
           infraType={infraType}
+          isTwoNodesOneArbiterCluster={hasTwoNodesOneArbiter}
           state={capacityAndNodes}
           storageClass={storageClass}
           volumeSetName={createLocalVolumeSet.volumeSetName}
@@ -146,6 +148,7 @@ export const createSteps = (
         nodes={nodes}
         stepIdReached={stepIdReached}
         isMCG={isMCG}
+        isThisTwoNodesOneArbiterCluster={hasTwoNodesOneArbiter}
         systemNamespace={systemNamespace}
       />
     ),

packages/odf/components/create-storage-system/create-storage-system-steps/capacity-and-nodes-step/capacity-and-nodes-step.tsx

@@ -56,6 +56,7 @@ import {
   TextVariants,
   TextContent,
   TextInput,
+  Alert,
 } from '@patternfly/react-core';
 import { ValidationMessage } from '../../../utils/common-odf-install-el';
 import { ErrorHandler } from '../../error-handler';
@@ -239,6 +240,7 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
   nodes,
   systemNamespace,
   isLSOPreConfigured,
+  isTwoNodesOneArbiterClusterEnabled,
 }) => {
   const { t } = useCustomTranslation();
 
@@ -249,6 +251,7 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
   const [hasStrechClusterEnabled, setHasStrechClusterEnabled] =
     React.useState(false);
   const [zones, setZones] = React.useState([]);
+  const [arbiterNode, setArbiterNode] = React.useState<WizardNodeState[]>([]);
 
   const pvsBySc = React.useMemo(
     () => getSCAvailablePVs(pvs, storageClassName),
@@ -281,12 +284,43 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
       );
       const nodesData = createWizardNodeState(filteredNodes);
       dispatch({ type: 'wizard/setNodes', payload: nodesData });
+
+      // get the arbiter node details
+      if (isTwoNodesOneArbiterClusterEnabled) {
+        const tnArbiter = allNodes.filter((node) =>
+          node.spec.taints?.some(
+            (someTaint) =>
+              someTaint['key'] === 'node-role.kubernetes.io/arbiter'
+          )
+        );
+        if (!!tnArbiter && tnArbiter.length === 1) {
+          const tnArbiterNodeData = createWizardNodeState(tnArbiter);
+          // TODO need to check whether there is more than one arbiter set,
+          // raise an error according to it
+          setArbiterNode(tnArbiterNodeData);
+          dispatch({
+            type: 'wizard/setTwoNodesOneArbiterCluster',
+            payload: isTwoNodesOneArbiterClusterEnabled,
+          });
+        }
+      }
     }
-  }, [dispatch, allNodeLoadError, allNodeLoaded, allNodes, pvsBySc]);
+  }, [
+    dispatch,
+    allNodeLoadError,
+    allNodeLoaded,
+    allNodes,
+    pvsBySc,
+    isTwoNodesOneArbiterClusterEnabled,
+  ]);
 
   React.useEffect(() => {
-    // Validates stretch cluster topology
-    if (allNodes.length && nodes.length) {
+    // Validates stretch cluster topology if this is not a TNA cluster
+    if (
+      allNodes.length &&
+      nodes.length &&
+      !isTwoNodesOneArbiterClusterEnabled
+    ) {
       const allZones = getZonesFromNodesKind(allNodes);
       const nodesPerZoneMap: NodesPerZoneMap =
         getPVAssociatedNodesPerZone(nodes);
@@ -298,7 +332,7 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
       setHasStrechClusterEnabled(isValidStretchCluster);
       setZones(allZones);
     }
-  }, [allNodes, nodes]);
+  }, [allNodes, nodes, isTwoNodesOneArbiterClusterEnabled]);
 
   // Skipping validation if LSO was configured as part of the SS deployment (in the previous LVS creation wizard step), as that step already have all the required validations
   // These validations are needed if LSO was already configured before even starting with the SS deployment
@@ -394,8 +428,21 @@ const SelectedCapacityAndNodes: React.FC<SelectedCapacityAndNodesProps> = ({
             />
           </GridItem>
           <GridItem span={10}>
-            <SelectedNodesTable data={nodes} />
+            <SelectedNodesTable data={nodes.concat(arbiterNode)} />
           </GridItem>
+          {isTwoNodesOneArbiterClusterEnabled && (
+            <GridItem span={10}>
+              <Alert
+                title="2-Nodes and 1-Arbiter setup detected"
+                variant="warning"
+                ouiaId="tna-cluster-details"
+              >
+                {t(
+                  'This setup spans across 3 zones with 2 data nodes and 1 arbiter. The arbiter maintains quorum without storing data. This setup uses replica-2, which tolerates only one node failure; data loss can occur if multiple nodes fail. Review your failure domain and recovery plan before proceeding.'
+                )}
+              </Alert>
+            </GridItem>
+          )}
         </Grid>
       </>
     </ErrorHandler>
@@ -412,6 +459,7 @@ type SelectedCapacityAndNodesProps = {
   systemNamespace: WizardState['backingStorage']['systemNamespace'];
   volumeValidationType: VolumeTypeValidation;
   isLSOPreConfigured: boolean;
+  isTwoNodesOneArbiterClusterEnabled: boolean;
 };
 
 export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
@@ -422,6 +470,7 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
   nodes,
   systemNamespace,
   infraType,
+  isTwoNodesOneArbiterCluster: isThisTwoNodesOneArbiterCluster,
 }) => {
   const {
     capacity,
@@ -452,6 +501,7 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
     nodes,
     state,
     isNoProvisioner,
+    isThisTwoNodesOneArbiterCluster,
     osdAmount
   );
   const onProfileChange = React.useCallback(
@@ -488,6 +538,7 @@ export const CapacityAndNodes: React.FC<CapacityAndNodesProps> = ({
           capacity={capacity}
           systemNamespace={systemNamespace}
           isLSOPreConfigured={isLSOPreConfigured}
+          isTwoNodesOneArbiterClusterEnabled={isThisTwoNodesOneArbiterCluster}
         />
       ) : (
         <SelectCapacityAndNodes
@@ -543,5 +594,6 @@ type CapacityAndNodesProps = {
   volumeSetName: WizardState['createLocalVolumeSet']['volumeSetName'];
   dispatch: WizardDispatch;
   infraType: InfraProviders;
+  isTwoNodesOneArbiterCluster: boolean;
   systemNamespace: WizardState['backingStorage']['systemNamespace'];
 };

packages/odf/components/create-storage-system/create-storage-system-steps/capacity-and-nodes-step/selected-nodes-table.tsx

@@ -8,11 +8,13 @@ import {
   getConvertedUnits,
 } from '@odf/shared/utils';
 import {
+  TableColumn,
   TableData,
   useActiveColumns,
   VirtualizedTable,
 } from '@openshift-console/dynamic-plugin-sdk';
 import classNames from 'classnames';
+import { Label } from '@patternfly/react-core';
 import { sortable } from '@patternfly/react-table';
 import { WizardNodeState } from '../../reducer';
 import { SelectNodesTableFooter } from '../../select-nodes-table/select-nodes-table-footer';
@@ -55,6 +57,8 @@ const tableColumnClasses = [
 
 const SelectedNodesTableRow = ({ obj, activeColumnIDs }) => {
   const { cpu, memory, zone, name, roles } = obj;
+  const rolesArr = roles as string[];
+  const isArbiter = rolesArr.some((r) => r === 'arbiter');
   return (
     <>
       <TableData {...tableColumnClasses[0]} activeColumnIDs={activeColumnIDs}>
@@ -63,6 +67,11 @@ const SelectedNodesTableRow = ({ obj, activeColumnIDs }) => {
           resourceModel={NodeModel}
           resourceName={name}
         />
+        {isArbiter && (
+          <Label color="green" variant="filled">
+            Arbiter
+          </Label>
+        )}
       </TableData>
       <TableData {...tableColumnClasses[1]} activeColumnIDs={activeColumnIDs}>
         {roles.join(', ') ?? '-'}
@@ -87,7 +96,7 @@ export const SelectedNodesTable: React.FC<SelectedNodesTableProps> = ({
   const { t } = useCustomTranslation();
 
   const SelectedNodesTableColumns = React.useMemo(
-    () => [
+    (): TableColumn<WizardNodeState>[] => [
       {
         title: t('Name'),
         sort: 'name',
@@ -120,7 +129,7 @@ export const SelectedNodesTable: React.FC<SelectedNodesTableProps> = ({
   );
 
   const [columns] = useActiveColumns({
-    columns: SelectedNodesTableColumns as any, // Todo(bipuladh): Update once sdk is updated
+    columns: SelectedNodesTableColumns,
     showNamespaceOverride: false,
     columnManagementID: 'SELECTED_NODES',
   });