mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-27 01:51:59 +00:00
Merge pull request #50342 from CheSema/fix-test-profile-events
do not fix the event list in test
This commit is contained in:
commit
72dde838cb
@ -31,61 +31,8 @@ def cluster():
|
||||
cluster.shutdown()
|
||||
|
||||
|
||||
init_list = {
|
||||
"ReadBufferFromS3Bytes": 0,
|
||||
"ReadBufferFromS3Microseconds": 0,
|
||||
"ReadBufferFromS3InitMicroseconds": 0,
|
||||
"ReadBufferFromS3RequestsErrors": 0,
|
||||
"WriteBufferFromS3Bytes": 0,
|
||||
"WriteBufferFromS3Microseconds": 0,
|
||||
"WriteBufferFromS3RequestsErrors": 0,
|
||||
"S3ReadMicroseconds": 0,
|
||||
"S3ReadRequestsCount": 0,
|
||||
"S3ReadRequestsErrorsTotal": 0,
|
||||
"S3ReadRequestsErrors503": 0,
|
||||
"S3ReadRequestsRedirects": 0,
|
||||
"S3WriteMicroseconds": 0,
|
||||
"S3WriteRequestsCount": 0,
|
||||
"S3WriteRequestsErrorsTotal": 0,
|
||||
"S3WriteRequestsErrors503": 0,
|
||||
"S3WriteRequestsRedirects": 0,
|
||||
"DiskS3ReadMicroseconds": 0,
|
||||
"DiskS3ReadRequestsCount": 0,
|
||||
"DiskS3ReadRequestsErrorsTotal": 0,
|
||||
"DiskS3ReadRequestsErrors503": 0,
|
||||
"DiskS3ReadRequestsRedirects": 0,
|
||||
"DiskS3WriteMicroseconds": 0,
|
||||
"DiskS3WriteRequestsCount": 0,
|
||||
"DiskS3WriteRequestsErrorsTotal": 0,
|
||||
"DiskS3WriteRequestsErrors503": 0,
|
||||
"DiskS3WriteRequestsRedirects": 0,
|
||||
"S3DeleteObjects": 0,
|
||||
"S3CopyObject": 0,
|
||||
"S3ListObjects": 0,
|
||||
"S3HeadObject": 0,
|
||||
"S3CreateMultipartUpload": 0,
|
||||
"S3UploadPartCopy": 0,
|
||||
"S3UploadPart": 0,
|
||||
"S3AbortMultipartUpload": 0,
|
||||
"S3CompleteMultipartUpload": 0,
|
||||
"S3PutObject": 0,
|
||||
"S3GetObject": 0,
|
||||
"DiskS3DeleteObjects": 0,
|
||||
"DiskS3CopyObject": 0,
|
||||
"DiskS3ListObjects": 0,
|
||||
"DiskS3HeadObject": 0,
|
||||
"DiskS3CreateMultipartUpload": 0,
|
||||
"DiskS3UploadPartCopy": 0,
|
||||
"DiskS3UploadPart": 0,
|
||||
"DiskS3AbortMultipartUpload": 0,
|
||||
"DiskS3CompleteMultipartUpload": 0,
|
||||
"DiskS3PutObject": 0,
|
||||
"DiskS3GetObject": 0,
|
||||
}
|
||||
|
||||
|
||||
def get_s3_events(instance):
|
||||
result = init_list.copy()
|
||||
result = dict()
|
||||
events = instance.query(
|
||||
"SELECT event, value FROM system.events WHERE event LIKE '%S3%'"
|
||||
).split("\n")
|
||||
@ -130,7 +77,7 @@ def get_minio_stat(cluster):
|
||||
|
||||
|
||||
def get_query_stat(instance, hint):
|
||||
result = init_list.copy()
|
||||
result = dict()
|
||||
instance.query("SYSTEM FLUSH LOGS")
|
||||
events = instance.query(
|
||||
"""
|
||||
@ -146,7 +93,10 @@ def get_query_stat(instance, hint):
|
||||
ev = event.split("\t")
|
||||
if len(ev) == 2:
|
||||
if "S3" in ev[0]:
|
||||
result[ev[0]] += int(ev[1])
|
||||
if ev[0] in result:
|
||||
result[ev[0]] += int(ev[1])
|
||||
else:
|
||||
result[ev[0]] = int(ev[1])
|
||||
return result
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user