xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: modify retry to upload to 8 minutes

This commit is contained in:
Alex Duan 2024-02-23 11:38:04 +08:00
parent ee7070445e
commit acdc21ff6c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/army/enterprise/s3/s3_basic.py
View File

@ -28,12 +28,12 @@ from frame import *
from frame.eos import * from frame.eos import *
# #
# 192.168.1.52 MINIO S3 API KEY: MQCEIoaPGUs1mhXgpUAu:XTgpN2dEMInnYgqN4gj3G5zgb39ROtsisKKy0GFa # 192.168.1.52 MINIO S3
# #
''' '''
s3EndPoint http://192.168.1.52:9000 s3EndPoint http://192.168.1.52:9000
s3AccessKey MQCEIoaPGUs1mhXgpUAu:XTgpN2dEMInnYgqN4gj3G5zgb39ROtsisKKy0GFa s3AccessKey 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX'
s3BucketName ci-bucket s3BucketName ci-bucket
s3UploadDelaySec 60 s3UploadDelaySec 60
''' '''
@ -42,7 +42,7 @@ s3UploadDelaySec 60
class TDTestCase(TBase): class TDTestCase(TBase):
updatecfgDict = { updatecfgDict = {
's3EndPoint': 'http://192.168.1.52:9000', 's3EndPoint': 'http://192.168.1.52:9000',
's3AccessKey': 'MQCEIoaPGUs1mhXgpUAu:XTgpN2dEMInnYgqN4gj3G5zgb39ROtsisKKy0GFa', 's3AccessKey': 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX',
's3BucketName': 'ci-bucket', 's3BucketName': 'ci-bucket',
's3BlockSize': '10240', 's3BlockSize': '10240',
's3BlockCacheSize': '320', 's3BlockCacheSize': '320',
@ -78,26 +78,27 @@ class TDTestCase(TBase):
self.trimDb(True) self.trimDb(True)
rootPath = sc.clusterRootPath() rootPath = sc.clusterRootPath()
cmd = f"ls {rootPath}/dnode1/data20/vnode/vnode*/tsdb/*.data" cmd = f"ls {rootPath}/dnode1/data2*/vnode/vnode*/tsdb/*.data"
tdLog.info(cmd) tdLog.info(cmd)
loop = 0 loop = 0
rets = [] rets = []
while loop < 500: while loop < 180:
time.sleep(3)
rets = eos.runRetList(cmd) rets = eos.runRetList(cmd)
cnt = len(rets) cnt = len(rets)
if cnt == 0: if cnt == 0:
tdLog.info("All data file upload to server over.") tdLog.info("All data file upload to server over.")
break break
time.sleep(3)
self.trimDb(True) self.trimDb(True)
loop += 1 tdLog.info(f"loop={loop} no upload {cnt} data files wait 3s retry ...")
tdLog.info(f"loop={loop} data files have {cnt} wait 5s...") if loop == 0:
if loop == 4:
sc.dnodeStop(1) sc.dnodeStop(1)
time.sleep(2) time.sleep(2)
sc.dnodeStart(1) sc.dnodeStart(1)
loop += 1
if len(rets) > 0: if len(rets) > 0:
tdLog.exit(f"s3 can not upload all data to server. data files={rets}") tdLog.exit(f"s3 can not upload all data to server. data files cnt={len(rets)} list={rets}")
def checkStreamCorrect(self): def checkStreamCorrect(self):
sql = f"select count(*) from {self.db}.stm1" sql = f"select count(*) from {self.db}.stm1"