PMM-11673-fix-psmdb-configuration: add extra configuration, add defau…

…lt configuration
percona · Apr 27, 2023 · ebb95b8 · ebb95b8
1 parent a712e59
commit ebb95b8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 1 deletion.
diff --git a/...ster/EditDBClusterPage/DBClusterAdvancedOptions/Configurations/Configuration.constants.ts b/...ster/EditDBClusterPage/DBClusterAdvancedOptions/Configurations/Configuration.constants.ts
@@ -0,0 +1,12 @@
+import { Databases } from 'app/percona/shared/core';
+export const PXCDefailtConfiguration =
+  'Configuration:                 [mysqld]\n' +
+  'wsrep_provider_options="gcache.size=600M"\n' +
+  "wsrep_trx_fragment_unit='bytes'\n" +
+  'wsrep_trx_fragment_size=3670018';
+export const PSMDBDefaultConfiguration = ' Configuration:  \n' + '      operationProfiling:\n' + '        mode: slowOp';
+
+export const DefaultDatabaseConfiguration: Partial<Record<Databases, string>> = {
+  [Databases.mysql]: PXCDefailtConfiguration,
+  [Databases.mongodb]: PSMDBDefaultConfiguration,
+};
diff --git a/...as/components/DBCluster/EditDBClusterPage/DBClusterBasicOptions/DBClusterBasicOptions.tsx b/...as/components/DBCluster/EditDBClusterPage/DBClusterBasicOptions/DBClusterBasicOptions.tsx
@@ -52,6 +52,7 @@ export const DBClusterBasicOptions: FC<DBClusterBasicOptionsProps> = ({ kubernet
   const onChangeDatabase = useCallback((databaseType) => {
     change(BasicOptionsFields.databaseType, databaseType);
     form.mutators.setClusterName(databaseType.value);
+    form.mutators.changeConfiguration(databaseType.value);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 

diff --git a/public/app/percona/dbaas/components/DBCluster/EditDBClusterPage/EditDBClusterPage.tsx b/public/app/percona/dbaas/components/DBCluster/EditDBClusterPage/EditDBClusterPage.tsx
@@ -5,7 +5,9 @@ import { Form } from 'react-final-form';
 import { Redirect, useHistory } from 'react-router-dom';
 
 import { Spinner, useStyles2 } from '@grafana/ui/src';
+import { DefaultDatabaseConfiguration } from 'app/percona/dbaas/components/DBCluster/EditDBClusterPage/DBClusterAdvancedOptions/Configurations/Configuration.constants';
 import { useShowPMMAddressWarning } from 'app/percona/shared/components/hooks/showPMMAddressWarning';
+import { Databases } from 'app/percona/shared/core';
 import { useSelector, useDispatch } from 'app/types';
 
 import { FeatureLoader } from '../../../../shared/components/Elements/FeatureLoader';
@@ -93,6 +95,11 @@ export const EditDBClusterPage: FC<EditDBClusterPageProps> = () => {
             trimConfiguration: ([configuration]: string[], state, { changeValue }) => {
               changeValue(state, ConfigurationFields.configuration, () => configuration.trim());
             },
+            changeConfiguration: (databaseTypeValue: Databases, state, { changeValue }) => {
+              changeValue(state, ConfigurationFields.configuration, () =>
+                databaseTypeValue ? DefaultDatabaseConfiguration[databaseTypeValue] : ''
+              );
+            },
             ...arrayMutators,
           }}
           render={({ form, handleSubmit, valid, pristine, ...props }) => (

diff --git a/public/app/percona/dbaas/components/DBCluster/EditDBClusterPage/EditDBClusterPage.utils.ts b/public/app/percona/dbaas/components/DBCluster/EditDBClusterPage/EditDBClusterPage.utils.ts
@@ -1,5 +1,8 @@
 import { logger } from '@percona/platform-core';
 
+import { DefaultDatabaseConfiguration } from 'app/percona/dbaas/components/DBCluster/EditDBClusterPage/DBClusterAdvancedOptions/Configurations/Configuration.constants';
+import { ConfigurationFields } from 'app/percona/dbaas/components/DBCluster/EditDBClusterPage/DBClusterAdvancedOptions/Configurations/Configurations.types';
+
 import { DATABASE_LABELS } from '../../../../shared/core';
 import { Kubernetes } from '../../Kubernetes/Kubernetes.types';
 import { getActiveOperators, getDatabaseOptionFromOperator } from '../../Kubernetes/Kubernetes.utils';
@@ -37,8 +40,12 @@ export const getAddInitialValues = (
       initialValues[BasicOptionsFields.kubernetesCluster] = initialCluster;
       if (activeOperators.length > 0) {
         const databaseDefaultOperator = getDatabaseOptionFromOperator(activeOperators[0]);
+        const defaultConfiguration = databaseDefaultOperator?.value
+          ? DefaultDatabaseConfiguration[databaseDefaultOperator?.value]
+          : '';
         initialValues[BasicOptionsFields.databaseType] = databaseDefaultOperator;
         initialValues[BasicOptionsFields.name] = `${databaseDefaultOperator?.value}-${generateUID()}`;
+        initialValues[ConfigurationFields.configuration] = defaultConfiguration;
       }
     }
   }
@@ -80,7 +87,10 @@ export const getEditInitialValues = (
     cpu,
     disk,
     memory,
-    configuration: configuration?.params?.pxc?.configuration || configuration?.params?.replicaset?.configuration,
+    configuration:
+      selectedDBCluster?.configuration ||
+      configuration?.params?.pxc?.configuration ||
+      configuration?.params?.replicaset?.configuration,
     expose: configuration?.exposed,
     internetFacing: configuration?.internet_facing,
     sourceRanges: sourceRangesArray,

diff --git a/public/app/percona/dbaas/components/DBCluster/PSMDB.service.ts b/public/app/percona/dbaas/components/DBCluster/PSMDB.service.ts
@@ -150,6 +150,7 @@ export class PSMDBService extends DBClusterService {
       availableImage: dbCluster.available_image,
       template: dbCluster.template,
       sourceRanges: dbCluster.source_ranges,
+      configuration: dbCluster.params.replicaset?.configuration,
     };
   }
 }

diff --git a/public/app/percona/dbaas/components/DBCluster/XtraDB.service.ts b/public/app/percona/dbaas/components/DBCluster/XtraDB.service.ts
@@ -159,6 +159,7 @@ export class XtraDBService extends DBClusterService {
       availableImage: dbCluster.available_image,
       template: dbCluster.template,
       sourceRanges: dbCluster.source_ranges,
+      configuration: dbCluster.params.pxc?.configuration,
     };
   }
 }