Skip to content

Commit 6c02961

Browse files
rsonghusterrsonghuster
authored
Merge pull request #124 from devsapp/fix-code
fix: deploy updateFunction error
2 parents 221811f + 390b97b commit 6c02961

11 files changed

Lines changed: 504 additions & 171 deletions

File tree

‎__tests__/e2e/scaling/s_149.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
edition: 3.0.0
2+
name: test-scaling-config
3+
access: quanxi_149
4+
5+
resources:
6+
fcDemo:
7+
component: ${env('fc_component_version', path('../../../'))}
8+
props:
9+
region: cn-hangzhou
10+
functionName: fc3-scaling-pool-149-${env('fc_component_function_name', 'scaling')}
11+
code: ./code
12+
handler: index.handler
13+
timeout: 60
14+
logConfig: auto
15+
gpuConfig:
16+
gpuMemorySize: 49152
17+
gpuType: fc.gpu.ada.1
18+
runtime: custom-container
19+
cpu: 8
20+
customContainerConfig:
21+
image: >-
22+
registry.cn-shanghai.aliyuncs.com/serverless_devs/custom-container-http-examples:springboot
23+
port: 9000
24+
instanceConcurrency: 20
25+
memorySize: 65536
26+
diskSize: 10240
27+
28+
provisionConfig:
29+
defaultTarget: 1
30+
alwaysAllocateCPU: false
31+
alwaysAllocateGPU: false
32+
33+
# scalingConfig:
34+
# # residentPoolId: fc-pool-5f044a31f87171jkwaraws
35+
# minInstances: 1
36+

‎__tests__/e2e/scaling/scalingConfig_provisionConfig.py‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
#!/usr/bin/env python3
2+
"""
3+
Test the conversion between scalingConfig and provisionConfig, as well as the conversion between GPUs of the same type and different types.
4+
"""
5+
import subprocess
6+
7+
import yaml
8+
9+
s_yaml_file = f"s_149.yaml"
10+
11+
12+
def deploy_function(scalingConfig, provisionConfig, gpuConfig=None, memorySize=None):
13+
"""
14+
部署函数
15+
根据 scalingConfig 或 provisionConfig 创建函数
16+
"""
17+
print(f"scalingConfig: {scalingConfig} provisionConfig: {provisionConfig}")
18+
# 使用当前文件夹下的s.yaml内容作为基础配置
19+
with open("s_149.yaml", "r", encoding="utf-8") as f:
20+
s_yaml = yaml.safe_load(f)
21+
22+
s_yaml["resources"]["fcDemo"]["props"]["scalingConfig"] = scalingConfig
23+
s_yaml["resources"]["fcDemo"]["props"]["provisionConfig"] = provisionConfig
24+
if gpuConfig:
25+
s_yaml["resources"]["fcDemo"]["props"]["gpuConfig"] = gpuConfig
26+
27+
if memorySize:
28+
s_yaml["resources"]["fcDemo"]["props"]["memorySize"] = memorySize
29+
30+
with open(s_yaml_file, "w", encoding="utf-8") as f:
31+
yaml.dump(s_yaml, f, default_flow_style=False, allow_unicode=True)
32+
33+
print(f"使用配置文件部署: {s_yaml_file}")
34+
35+
# 执行部署命令
36+
print("正在部署...")
37+
subprocess.check_call(f"s deploy -y -t {s_yaml_file} --skip-push", shell=True)
38+
39+
40+
def cleanup_deployment():
41+
"""
42+
清理部署
43+
"""
44+
print(f"正在清理部署: {s_yaml_file}")
45+
subprocess.check_call(f"s remove -y -t {s_yaml_file}", shell=True)
46+
47+
48+
def main():
49+
"""
50+
主函数
51+
修改 scalingConfig 和 provisionConfig，并测试转换
52+
"""
53+
54+
subprocess.check_call(f"s deploy -y -t {s_yaml_file} --skip-push", shell=True)
55+
56+
# GPU remains unchanged
57+
# 弹性 ----> 弹性
58+
scalingConfig = {
59+
"minInstances": 1,
60+
}
61+
provisionConfig = {}
62+
deploy_function(scalingConfig, provisionConfig)
63+
64+
# 弹性 ----> 常驻
65+
scalingConfig = {
66+
"residentPoolId": "fc-pool-5f044a31f87171jkwaraws",
67+
"maxInstances": 1,
68+
}
69+
provisionConfig = {}
70+
deploy_function(scalingConfig, provisionConfig)
71+
72+
# 常驻 ----> 常驻
73+
scalingConfig = {
74+
"residentPoolId": "fc-pool-16bedd56db9626uva1it08",
75+
"maxInstances": 1,
76+
}
77+
provisionConfig = {}
78+
deploy_function(scalingConfig, provisionConfig)
79+
80+
# 常驻 ----> 弹性
81+
scalingConfig = {
82+
"minInstances": 1,
83+
}
84+
provisionConfig = {}
85+
deploy_function(scalingConfig, provisionConfig)
86+
87+
cleanup_deployment()
88+
89+
# GPU remains changed
90+
# 弹性 ----> 弹性
91+
scalingConfig = {
92+
"minInstances": 1,
93+
}
94+
gpuConfig = {
95+
"gpuType": "fc.gpu.tesla.1",
96+
"gpuMemorySize": 1,
97+
}
98+
provisionConfig = {}
99+
memorySize = 32768
100+
deploy_function(scalingConfig, provisionConfig, gpuConfig, memorySize)
101+
102+
# 弹性 ----> 常驻
103+
scalingConfig = {
104+
"residentPoolId": "fc-pool-16bedd56db9626uva1it08",
105+
"maxInstances": 1,
106+
}
107+
gpuConfig = {
108+
"gpuType": "fc.gpu.ada.1",
109+
"gpuMemorySize": 1,
110+
}
111+
provisionConfig = {}
112+
memorySize = 65536
113+
deploy_function(scalingConfig, provisionConfig, gpuConfig, memorySize)
114+
115+
# 常驻 ----> 常驻
116+
scalingConfig = {
117+
"residentPoolId": "fc-pool-16bedd56db96260yid15cs",
118+
"maxInstances": 1,
119+
}
120+
gpuConfig = {
121+
"gpuType": "fc.gpu.ada.2",
122+
"gpuMemorySize": 1,
123+
}
124+
provisionConfig = {}
125+
memorySize = 32768
126+
deploy_function(scalingConfig, provisionConfig, gpuConfig, memorySize)
127+
128+
# 常驻 ----> 弹性
129+
scalingConfig = {
130+
"minInstances": 1,
131+
}
132+
gpuConfig = {
133+
"gpuType": "fc.gpu.tesla.1",
134+
"gpuMemorySize": 1,
135+
}
136+
provisionConfig = {}
137+
memorySize = 32768
138+
deploy_function(scalingConfig, provisionConfig, gpuConfig, memorySize)
139+
140+
cleanup_deployment()

‎__tests__/ut/commands/deploy/impl/provision_config_test.ts‎

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,27 @@ describe('ProvisionConfig', () => {
137137
writable: true,
138138
});
139139

140-
// Mock scalingConfig.provisionConfigErrorRetry
140+
// Mock provisionConfigErrorRetry
141+
const utils = require('../../../../../src/subCommands/deploy/utils');
141142
const provisionConfigErrorRetrySpy = jest
142-
.spyOn(provisionConfig.scalingConfig, 'provisionConfigErrorRetry')
143+
.spyOn(utils, 'provisionConfigErrorRetry')
143144
.mockResolvedValue(undefined);
144145

145146
const result = await provisionConfig.run();
146147

147-
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith('ProvisionConfig', 'LATEST', {
148-
defaultTarget: 10,
149-
alwaysAllocateCPU: false,
150-
alwaysAllocateGPU: false,
151-
scheduledActions: [],
152-
targetTrackingPolicies: [],
153-
});
148+
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith(
149+
provisionConfig.fcSdk,
150+
'ProvisionConfig',
151+
'test-function',
152+
'LATEST',
153+
{
154+
defaultTarget: 10,
155+
alwaysAllocateCPU: false,
156+
alwaysAllocateGPU: false,
157+
scheduledActions: [],
158+
targetTrackingPolicies: [],
159+
},
160+
);
154161
expect(result).toBe(true);
155162
});
156163

@@ -171,9 +178,10 @@ describe('ProvisionConfig', () => {
171178
writable: true,
172179
});
173180

174-
// Mock scalingConfig.provisionConfigErrorRetry
181+
// Mock provisionConfigErrorRetry
182+
const utils = require('../../../../../src/subCommands/deploy/utils');
175183
const provisionConfigErrorRetrySpy = jest
176-
.spyOn(provisionConfig.scalingConfig, 'provisionConfigErrorRetry')
184+
.spyOn(utils, 'provisionConfigErrorRetry')
177185
.mockResolvedValue(undefined);
178186

179187
const waitForProvisionReadySpy = jest
@@ -182,13 +190,19 @@ describe('ProvisionConfig', () => {
182190

183191
await provisionConfig.run();
184192

185-
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith('ProvisionConfig', 'LATEST', {
186-
defaultTarget: 10,
187-
alwaysAllocateCPU: false,
188-
alwaysAllocateGPU: false,
189-
scheduledActions: [],
190-
targetTrackingPolicies: [],
191-
});
193+
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith(
194+
provisionConfig.fcSdk,
195+
'ProvisionConfig',
196+
'test-function',
197+
'LATEST',
198+
{
199+
defaultTarget: 10,
200+
alwaysAllocateCPU: false,
201+
alwaysAllocateGPU: false,
202+
scheduledActions: [],
203+
targetTrackingPolicies: [],
204+
},
205+
);
192206
expect(waitForProvisionReadySpy).toHaveBeenCalledWith('LATEST', {
193207
defaultTarget: 10,
194208
alwaysAllocateCPU: false,
@@ -215,22 +229,29 @@ describe('ProvisionConfig', () => {
215229
writable: true,
216230
});
217231

218-
// Mock scalingConfig.provisionConfigErrorRetry
232+
// Mock provisionConfigErrorRetry
233+
const utils = require('../../../../../src/subCommands/deploy/utils');
219234
const provisionConfigErrorRetrySpy = jest
220-
.spyOn(provisionConfig.scalingConfig, 'provisionConfigErrorRetry')
235+
.spyOn(utils, 'provisionConfigErrorRetry')
221236
.mockResolvedValue(undefined);
222237

223238
const waitForProvisionReadySpy = jest.spyOn(provisionConfig as any, 'waitForProvisionReady');
224239

225240
await provisionConfig.run();
226241

227-
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith('ProvisionConfig', 'LATEST', {
228-
defaultTarget: 10,
229-
alwaysAllocateCPU: false,
230-
alwaysAllocateGPU: false,
231-
scheduledActions: [],
232-
targetTrackingPolicies: [],
233-
});
242+
expect(provisionConfigErrorRetrySpy).toHaveBeenCalledWith(
243+
provisionConfig.fcSdk,
244+
'ProvisionConfig',
245+
'test-function',
246+
'LATEST',
247+
{
248+
defaultTarget: 10,
249+
alwaysAllocateCPU: false,
250+
alwaysAllocateGPU: false,
251+
scheduledActions: [],
252+
targetTrackingPolicies: [],
253+
},
254+
);
234255
expect(waitForProvisionReadySpy).not.toHaveBeenCalled();
235256
expect(logger.info).toHaveBeenCalledWith(
236257
`Skip wait provisionConfig of ${provisionConfig.functionName}/LATEST to instance up`,

0 commit comments

Comments
 (0)