Skip to content

fix: use currentInstances==targetInstances replace currentInstances==minInstances in waitForScalingReady #130

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.

Sign up for GitHub

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

Merged
rsonghuster merged 1 commit into from
Dec 19, 2025
Merged

fix: use currentInstances==targetInstances replace currentInstances==minInstances in waitForScalingReady #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions __tests__/ut/commands/deploy/impl/scaling_config_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('ScalingConfig', () => {
writable: true,
});

const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockResolvedValue(undefined);
Expand Down Expand Up @@ -114,7 +114,7 @@ describe('ScalingConfig', () => {

isProvisionConfigErrorMock.mockReturnValue(false);

const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockRejectedValue(new Error('network error'));
Expand Down Expand Up @@ -160,7 +160,7 @@ describe('ScalingConfig', () => {

isProvisionConfigErrorMock.mockReturnValue(true);

const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockImplementation(async (fcSdk, command, functionName, qualifier, localConfig) => {
Expand Down Expand Up @@ -208,7 +208,7 @@ describe('ScalingConfig', () => {

isProvisionConfigErrorMock.mockReturnValue(true);

const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockRejectedValue(new Error('Failed to create scalingConfig after 60 attempts'));
Expand Down Expand Up @@ -249,7 +249,7 @@ describe('ScalingConfig', () => {
writable: true,
});

const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockResolvedValue(undefined);
Expand Down Expand Up @@ -376,7 +376,7 @@ describe('ScalingConfig', () => {
putFunctionScalingConfig: jest.fn().mockResolvedValue(undefined),
getFunctionScalingConfig: jest
.fn()
.mockResolvedValue({ currentInstances: 1, minInstances: 1 }),
.mockResolvedValue({ currentInstances: 1, targetInstances: 1 }),
disableFunctionInvocation: jest.fn().mockResolvedValue(undefined),
enableFunctionInvocation: jest.fn().mockResolvedValue(undefined),
};
Expand All @@ -386,7 +386,7 @@ describe('ScalingConfig', () => {
});

// Mock provisionConfigErrorRetry
const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockResolvedValue(undefined);
Expand All @@ -401,7 +401,7 @@ describe('ScalingConfig', () => {
{ minInstances: 1 },
);
expect(logger.info).toHaveBeenCalledWith(
'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 1, MinInstances: 1',
'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 1, TargetInstances: 1',
);
expect(result).toBe(true);
});
Expand Down Expand Up @@ -430,7 +430,7 @@ describe('ScalingConfig', () => {
});

// Mock provisionConfigErrorRetry
const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockResolvedValue(undefined);
Expand Down Expand Up @@ -475,7 +475,7 @@ describe('ScalingConfig', () => {
});

// Mock provisionConfigErrorRetry
const utils = require('../../../../../src/subCommands/deploy/utils');
const utils = require('../../../../../src/subCommands/deploy/utils/index');
const provisionConfigErrorRetrySpy = jest
.spyOn(utils, 'provisionConfigErrorRetry')
.mockResolvedValue(undefined);
Expand Down Expand Up @@ -644,15 +644,15 @@ describe('ScalingConfig', () => {
expect(mockFcSdk.getFunctionScalingConfig).toHaveBeenCalled();
});

it('should wait until currentInstances reaches minInstances', async () => {
it('should wait until currentInstances reaches targetInstances', async () => {
scalingConfig = new ScalingConfig(mockInputs, mockOpts);

// Mock fcSdk
const mockFcSdk = {
getFunctionScalingConfig: jest
.fn()
.mockResolvedValueOnce({ currentInstances: 5, minInstances: 10 })
.mockResolvedValueOnce({ currentInstances: 10, minInstances: 10 }),
.mockResolvedValueOnce({ currentInstances: 5, targetInstances: 10 })
.mockResolvedValueOnce({ currentInstances: 10, targetInstances: 10 }),
disableFunctionInvocation: jest.fn().mockResolvedValue(undefined),
enableFunctionInvocation: jest.fn().mockResolvedValue(undefined),
};
Expand All @@ -665,7 +665,7 @@ describe('ScalingConfig', () => {

expect(mockFcSdk.getFunctionScalingConfig).toHaveBeenCalledTimes(2);
expect(logger.info).toHaveBeenCalledWith(
'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 10, MinInstances: 10',
'ScalingConfig of test-function/LATEST is ready. CurrentInstances: 10, TargetInstances: 10',
);
});

Expand Down
2 changes: 1 addition & 1 deletion publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type: Component
Name: fc3
Provider:
- 阿里云
Version: 0.1.10
Version: 0.1.11
Description: 阿里云函数计算全生命周期管理
HomePage: https://github.com/devsapp/fc3
Organization: 阿里云函数计算（FC）
Expand Down
11 changes: 4 additions & 7 deletions src/subCommands/deploy/impl/scaling_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,15 @@ export default class ScalingConfig extends Base {
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, currentError } = result || {};
const { currentInstances, currentError, targetInstances } = result || {};

logger.debug(
`get ${this.functionName}/${qualifier} scaling config result: ${JSON.stringify(result)}`,
);
// 检查是否已达到最小实例数
if (
currentInstances === undefined ||
(currentInstances && currentInstances === result.minInstances)
) {
if (currentInstances === undefined || currentInstances === targetInstances) {
Copy link
Contributor

@rsonghuster rsonghuster Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

targetInstances 存在 undefined 的情况吗？

logger.info(
`ScalingConfig of ${this.functionName}/${qualifier} is ready. CurrentInstances: ${currentInstances}, MinInstances: ${minInstances}`,
`ScalingConfig of ${this.functionName}/${qualifier} is ready. CurrentInstances: ${currentInstances}, TargetInstances: ${targetInstances}`,
);
return;
}
Expand All @@ -142,7 +139,7 @@ export default class ScalingConfig extends Base {
}

logger.info(
`waiting ${this.functionName}/${qualifier} scaling OK: currentInstances: ${currentInstances}, minInstances: ${minInstances}`,
`waiting ${this.functionName}/${qualifier} scaling OK: currentInstances: ${currentInstances}, targetInstances: ${targetInstances}`,
);

// eslint-disable-next-line no-await-in-loop
Expand Down
Loading