mmalygina
/
xk6-frostfs
forked from TrueCloudLab/xk6-frostfs
1
0
Fork 0
Code Pull Requests Activity

add logs to delete 

Signed-off-by: m.malygina <m.malygina@yadro.com>
m.malygina 2024-06-20 16:37:00 +03:00
parent 7fb230a7c1
commit 1f8db10d94
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/s3/client.go
View File

@ -108,7 +108,7 @@ func (c *Client) Multipart(bucket, key string, objPartSize, concurrency int, pay
func (c *Client) Delete(bucket, key string) DeleteResponse { func (c *Client) Delete(bucket, key string) DeleteResponse {
start := time.Now() start := time.Now()
println("Delete bucket:", bucket, " key:", key)
_, err := c.cli.DeleteObject(c.vu.Context(), &s3.DeleteObjectInput{ _, err := c.cli.DeleteObject(c.vu.Context(), &s3.DeleteObjectInput{
Bucket: aws.String(bucket), Bucket: aws.String(bucket),
Key: aws.String(key), Key: aws.String(key),

17
scenarios/s3_dar.js
View File

@ -86,8 +86,7 @@ const delete_age = __ENV.DELETE_AGE ? parseInt(__ENV.DELETE_AGE) : undefined;
let obj_to_delete_selector = undefined; let obj_to_delete_selector = undefined;
let obj_to_delete_exit_on_null = undefined; let obj_to_delete_exit_on_null = undefined;
if (registry_enabled && delete_age) { if (registry_enabled && delete_age) {
obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0); obj_to_delete_exit_on_null = (write_vu_count == 0) && (read_vu_count == 0)
console.debug(`obj_to_delete_exit_on_null: ${obj_to_delete_exit_on_null}`);
let constructor = obj_to_delete_exit_on_null ? registry.getOneshotSelector let constructor = obj_to_delete_exit_on_null ? registry.getOneshotSelector
: registry.getSelector; : registry.getSelector;
@ -139,9 +138,8 @@ export function setup() {
} }
export function teardown(data) { export function teardown(data) {
console.log("Teardown")
if (obj_registry) { if (obj_registry) {
obj_registry.close() obj_registry.close();
} }
const end_timestamp = Date.now() const end_timestamp = Date.now()
console.log( console.log(
@ -179,13 +177,12 @@ export function obj_read() {
if (__ENV.SLEEP_READ) { if (__ENV.SLEEP_READ) {
sleep(__ENV.SLEEP_READ); sleep(__ENV.SLEEP_READ);
} }
log.withFields({op : 'obj_read - ENTERED'}).info("INFO");
if (obj_to_read_selector) { if (obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(); const obj = obj_to_read_selector.nextObject();
if (!obj ) { if (!obj ) {
return; return;
} }
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'READ START'}).info("INFO");
const resp = s3_client.get(obj.s3_bucket, obj.s3_key) const resp = s3_client.get(obj.s3_bucket, obj.s3_key)
if (!resp.success) { if (!resp.success) {
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, status: obj.status, op: `READ`}) log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, status: obj.status, op: `READ`})
@ -193,7 +190,7 @@ export function obj_read() {
} else { } else {
obj_registry.setObjectStatus(obj.id, obj.status, 'read'); obj_registry.setObjectStatus(obj.id, obj.status, 'read');
} }
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'READ FINISHED'}).info("INFO");
return return
} }
@ -211,7 +208,7 @@ export function obj_delete() {
if (__ENV.SLEEP_DELETE) { if (__ENV.SLEEP_DELETE) {
sleep(__ENV.SLEEP_DELETE); sleep(__ENV.SLEEP_DELETE);
} }
log.withFields({op : 'obj_delete - ENTERED'}).info("INFO");
const obj = obj_to_delete_selector.nextObject(); const obj = obj_to_delete_selector.nextObject();
delete_object(obj) delete_object(obj)
} }
@ -223,13 +220,13 @@ export function delete_object(obj) {
} }
return; return;
} }
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETED START'}).info("INFO");
const resp = s3_client.delete(obj.s3_bucket, obj.s3_key); const resp = s3_client.delete(obj.s3_bucket, obj.s3_key);
if (!resp.success) { if (!resp.success) {
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETE'}) log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETE'})
.error(resp.error); .error(resp.error);
return; return;
} }
log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETED SUCCESS'}).info("INFO");
obj_registry.deleteObject(obj.id); obj_registry.deleteObject(obj.id);
} }