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

fix: s3 with different bucket name 1~20

This commit is contained in:
Alex Duan 2024-06-05 18:30:27 +08:00
parent 95c4b7748f
commit 64c577465c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/army/enterprise/s3/s3Basic.py
View File

@ -46,17 +46,20 @@ for test:
class TDTestCase(TBase): class TDTestCase(TBase):
index = util.cpuRand(20) + 1
bucketName = f"ci-bucket{index}"
updatecfgDict = { updatecfgDict = {
"supportVnodes":"1000", "supportVnodes":"1000",
's3EndPoint': 'http://192.168.1.52:9000', 's3EndPoint': 'http://192.168.1.52:9000',
's3AccessKey': 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX', 's3AccessKey': 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX',
's3BucketName': 'ci-bucket', 's3BucketName': f'{bucketName}',
's3PageCacheSize': '10240', 's3PageCacheSize': '10240',
"s3UploadDelaySec": "10", "s3UploadDelaySec": "10",
's3MigrateIntervalSec': '600', 's3MigrateIntervalSec': '600',
's3MigrateEnabled': '1' 's3MigrateEnabled': '1'
} }
tdLog.info(f"assign bucketName is {bucketName}\n")
maxFileSize = (128 + 10) * 1014 * 1024 # add 10M buffer maxFileSize = (128 + 10) * 1014 * 1024 # add 10M buffer
def insertData(self): def insertData(self):
@ -241,10 +244,9 @@ class TDTestCase(TBase):
# #
def preDb(self, vgroups): def preDb(self, vgroups):
cnt = int(time.time())%2 + 1
cnt = int(time.time())%3 + 1
for i in range(cnt): for i in range(cnt):
vg = int(time.time()*1000)%10 + 1 vg = util.cpuRand(9) + 1
sql = f"create database predb vgroups {vg}" sql = f"create database predb vgroups {vg}"
tdSql.execute(sql, show=True) tdSql.execute(sql, show=True)
sql = "drop database predb" sql = "drop database predb"

2
tests/army/frame/etime.py
View File

@ -19,5 +19,3 @@ import sys
import os import os
import time import time
import datetime import datetime