fix: deploy updateFunction error

Author: 高魏洪

__tests__/ut/commands/deploy/impl/function_test.ts

@@ -237,6 +237,7 @@ describe('Service', () => {
         {
           slsAuto: false,
           type: 'config',
+          removeScalingConfig: expect.any(Function)
         },
       );
     });
@@ -308,6 +309,7 @@ describe('Service', () => {
         {
           slsAuto: false,
           type: 'code',
+          removeScalingConfig: expect.any(Function)
         },
       );
     });

__tests__/ut/resources/fc/index_test.ts

@@ -171,7 +171,7 @@ describe('FC', () => {
       mockFc20230330Client.untagResources.mockResolvedValue({});
       mockFc20230330Client.tagResources.mockResolvedValue({});
 
-      await fc.deployFunction(mockConfig, { slsAuto: false, type: undefined });
+      await fc.deployFunction(mockConfig, { slsAuto: false, type: undefined, removeScalingConfig: null });
 
       expect(mockFc20230330Client.untagResources).toHaveBeenCalled();
       expect(mockFc20230330Client.tagResources).toHaveBeenCalled();
@@ -181,7 +181,7 @@ describe('FC', () => {
       mockConfig.tags = Array(21).fill({ key: 'tag', value: 'value' });
 
       await expect(
-        fc.deployFunction(mockConfig, { slsAuto: false, type: undefined }),
+        fc.deployFunction(mockConfig, { slsAuto: false, type: undefined, removeScalingConfig: null }),
       ).rejects.toThrow('The number of tags cannot exceed 20');
     });
 
@@ -192,7 +192,7 @@ describe('FC', () => {
       ];
 
       await expect(
-        fc.deployFunction(mockConfig, { slsAuto: false, type: undefined }),
+        fc.deployFunction(mockConfig, { slsAuto: false, type: undefined, removeScalingConfig: null }),
       ).rejects.toThrow('The tag keys must be unique');
     });
   });

src/resources/fc/error-code.ts

@@ -51,3 +51,15 @@ export const isFunctionStateWaitTimedOut = (ex) => {
   }
   return false;
 };
+
+export const isFunctionScalingConfigError = (ex, localGPUType, remoteGPUType) => {
+  if (
+    ex.message.includes('GPU type should not be changed with resident scaling config') ||
+    ex.message.includes(
+      `function gpu type '${localGPUType}' doesn't match resident pool gpu type '${remoteGPUType}'`,
+    )
+  ) {
+    return true;
+  }
+  return false;
+};

src/resources/fc/index.ts

@@ -53,6 +53,7 @@ import {
   isInvalidArgument,
   isFailedState,
   isFunctionStateWaitTimedOut,
+  isFunctionScalingConfigError,
 } from './error-code';
 import { isCustomContainerRuntime, isCustomRuntime, computeLocalAuto } from './impl/utils';
 import replaceFunctionConfig from './impl/replace-function-config';
@@ -175,7 +176,7 @@ export default class FC extends FC_Client {
   /**
    * 创建或者修改函数
    */
-  async deployFunction(config: IFunction, { slsAuto, type }): Promise<void> {
+  async deployFunction(config: IFunction, { slsAuto, type, removeScalingConfig }): Promise<void> {
     logger.debug(`Deploy function use config:\n${JSON.stringify(config, null, 2)}`);
     let needUpdate = false;
     let remoteConfig = null;
@@ -302,11 +303,18 @@ export default class FC extends FC_Client {
         */
         const { project, logstore } = (config.logConfig || {}) as ILogConfig;
         const retrySls = slsAuto && isSlsNotExistException(project, logstore, ex);
+        const localGPUType = config.gpuConfig?.gpuType;
+        const remoteGPUType = remoteConfig.gpuConfig?.gpuType;
         if (retrySls) {
           if (calculateRetryTime(3)) {
             throw ex;
           }
           retryInterval = 5;
+        } else if (
+          isInvalidArgument(ex) &&
+          isFunctionScalingConfigError(ex, localGPUType, remoteGPUType)
+        ) {
+          removeScalingConfig();
         } else if (
           isAccessDenied(ex) ||
           isInvalidArgument(ex) ||

src/subCommands/deploy/impl/function.ts

@@ -21,6 +21,7 @@ import { ICredentials } from '@serverless-devs/component-interface';
 import { calculateCRC64, getFileSize } from '../../../utils';
 import OSS from '../../../resources/oss';
 import { setNodeModulesBinPermissions } from '../../../resources/fc/impl/utils';
+import ScalingConfig from './scaling_config';
 
 type IType = 'code' | 'config' | boolean;
 interface IOpts {
@@ -38,6 +39,8 @@ export default class Service extends Base {
   createResource: Record<string, any> = {};
   acr: Acr;
   codeChecksum: string;
+  scalingConfig: ScalingConfig;
+  qualifier: string;
 
   constructor(inputs: IInputs, opts: IOpts) {
     super(inputs, opts.yes);
@@ -49,6 +52,13 @@ export default class Service extends Base {
     this.type = opts.type;
     this.skipPush = opts.skipPush;
     logger.debug(`deploy function type: ${this.type}`);
+    this.scalingConfig = new ScalingConfig(inputs, {
+      yes: opts.yes,
+    });
+    this.qualifier =
+      _.get(inputs.props, 'provisionConfig.qualifier') ||
+      _.get(inputs.props, 'scalingConfig.qualifier') ||
+      'LATEST';
 
     this.local = _.cloneDeep(inputs.props);
     _.unset(this.local, 'region');
@@ -84,6 +94,7 @@ export default class Service extends Base {
     const { local, remote } = await FC.replaceFunctionConfig(this.local, this.remote);
     this.local = local;
     this.remote = remote;
+    this.scalingConfig.before();
 
     await this._plan();
   }
@@ -122,9 +133,12 @@ export default class Service extends Base {
       logger.debug('sessionAffinityConfig', config.sessionAffinityConfig);
       config.sessionAffinityConfig = JSON.stringify(config.sessionAffinityConfig);
     }
+    const removeScalingConfig = async () =>
+      await this.scalingConfig.removeScalingConfig(this.qualifier);
     await this.fcSdk.deployFunction(config, {
       slsAuto: !_.isEmpty(this.createResource.sls),
       type: this.type,
+      removeScalingConfig,
     });
     return this.needDeploy;
   }

src/subCommands/deploy/impl/scaling_config.ts

@@ -123,6 +123,46 @@ export default class ScalingConfig extends Base {
     }
   }
 
+  /**
+   * 删除弹性配置
+   */
+  async removeScalingConfig(qualifier: string) {
+    try {
+      if (!_.isEmpty(this.remote)) {
+        logger.info(`Remove remote scalingConfig of ${this.functionName}/${qualifier}`);
+        await this.fcSdk.removeFunctionScalingConfig(this.functionName, qualifier);
+
+        // 等待弹性配置实例数降至0
+        const maxRetries = 12;
+        for (let index = 0; index < maxRetries; index++) {
+          // eslint-disable-next-line no-await-in-loop
+          const result = await this.fcSdk.getFunctionScalingConfig(this.functionName, qualifier);
+          const { currentInstances } = result || {};
+
+          if (!currentInstances || currentInstances === 0) {
+            logger.info(`ScalingConfig of ${this.functionName}/${qualifier} removed successfully`);
+            return;
+          }
+
+          logger.info(
+            `waiting ${this.functionName}/${qualifier} scaling currentInstances to 0 ...`,
+          );
+          // eslint-disable-next-line no-await-in-loop
+          await sleep(5);
+        }
+
+        logger.warn(
+          `Timeout waiting for scalingConfig of ${this.functionName}/${qualifier} to be removed`,
+        );
+      }
+    } catch (ex) {
+      logger.error(
+        `Remove remote scalingConfig of ${this.functionName}/${qualifier} error: ${ex.message}`,
+      );
+      throw ex;
+    }
+  }
+
   /**
    * 等待弹性配置实例就绪
    */
@@ -175,46 +215,6 @@ export default class ScalingConfig extends Base {
     );
   }
 
-  /**
-   * 删除弹性配置
-   */
-  private async removeScalingConfig(qualifier: string) {
-    try {
-      if (!_.isEmpty(this.remote)) {
-        logger.info(`Remove remote scalingConfig of ${this.functionName}/${qualifier}`);
-        await this.fcSdk.removeFunctionScalingConfig(this.functionName, qualifier);
-
-        // 等待弹性配置实例数降至0
-        const maxRetries = 12;
-        for (let index = 0; index < maxRetries; index++) {
-          // eslint-disable-next-line no-await-in-loop
-          const result = await this.fcSdk.getFunctionScalingConfig(this.functionName, qualifier);
-          const { currentInstances } = result || {};
-
-          if (!currentInstances || currentInstances === 0) {
-            logger.info(`ScalingConfig of ${this.functionName}/${qualifier} removed successfully`);
-            return;
-          }
-
-          logger.info(
-            `waiting ${this.functionName}/${qualifier} scaling currentInstances to 0 ...`,
-          );
-          // eslint-disable-next-line no-await-in-loop
-          await sleep(5);
-        }
-
-        logger.warn(
-          `Timeout waiting for scalingConfig of ${this.functionName}/${qualifier} to be removed`,
-        );
-      }
-    } catch (ex) {
-      logger.error(
-        `Remove remote scalingConfig of ${this.functionName}/${qualifier} error: ${ex.message}`,
-      );
-      throw ex;
-    }
-  }
-
   /**
    * 清理弹性配置对象
    */