dstepanov-yadro/xk6-frostfs
1
0
Fork 0
forked from TrueCloudLab/xk6-frostfs
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#25] selector: Remove next object timeout

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2023-07-20 15:01:57 +03:00
parent 0dc0ba1704
commit 704c0f06bc
9 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/registry/obj_exporter.go
View file

@ -45,7 +45,7 @@ func (o *ObjExporter) ExportJSONPreGen(fileName string) error {
var comma string var comma string
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
info := o.selector.NextObject(5) info := o.selector.NextObject()
if info == nil { if info == nil {
break break
} }

12
internal/registry/obj_selector.go
View file

@ -53,15 +53,9 @@ func NewObjSelector(registry *ObjRegistry, selectionSize int, filter *ObjFilter)
// the following happens: // the following happens:
// - a "new" next object is available; // - a "new" next object is available;
// - underlying registry context is done, nil objects will be returned on the // - underlying registry context is done, nil objects will be returned on the
// currently blocked and every further NextObject calls; // currently blocked and every further NextObject calls.
// - timeoutSeconds elapsed, nil object will be returned. func (o *ObjSelector) NextObject() *ObjectInfo {
func (o *ObjSelector) NextObject(timeoutSeconds int) *ObjectInfo { return <-o.objChan
select {
case <-time.After(time.Duration(timeoutSeconds) * time.Second):
return nil
case obj := <-o.objChan:
return obj
}
} }
// Count returns total number of objects that match filter of the selector. // Count returns total number of objects that match filter of the selector.

4
scenarios/grpc.js
View file

@ -162,7 +162,7 @@ export function obj_read() {
} }
if(obj_to_read_selector) { if(obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(5); const obj = obj_to_read_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }
@ -185,7 +185,7 @@ export function obj_delete() {
sleep(__ENV.SLEEP_DELETE); sleep(__ENV.SLEEP_DELETE);
} }
const obj = obj_to_delete_selector.nextObject(5); const obj = obj_to_delete_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

4
scenarios/grpc_car.js
View file

@ -186,7 +186,7 @@ export function obj_read() {
} }
if(obj_to_read_selector) { if(obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(5); const obj = obj_to_read_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }
@ -209,7 +209,7 @@ export function obj_delete() {
sleep(__ENV.SLEEP_DELETE); sleep(__ENV.SLEEP_DELETE);
} }
const obj = obj_to_delete_selector.nextObject(5); const obj = obj_to_delete_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

2
scenarios/local.js
View file

@ -142,7 +142,7 @@ export function obj_read() {
} }
export function obj_delete() { export function obj_delete() {
const obj = obj_to_delete_selector.nextObject(5); const obj = obj_to_delete_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

4
scenarios/s3.js
View file

@ -157,7 +157,7 @@ export function obj_read() {
} }
if(obj_to_read_selector) { if(obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(5); const obj = obj_to_read_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }
@ -181,7 +181,7 @@ export function obj_delete() {
sleep(__ENV.SLEEP_DELETE); sleep(__ENV.SLEEP_DELETE);
} }
const obj = obj_to_delete_selector.nextObject(5); const obj = obj_to_delete_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

4
scenarios/s3_car.js
View file

@ -184,7 +184,7 @@ export function obj_read() {
} }
if(obj_to_read_selector) { if(obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(5); const obj = obj_to_read_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }
@ -208,7 +208,7 @@ export function obj_delete() {
sleep(__ENV.SLEEP_DELETE); sleep(__ENV.SLEEP_DELETE);
} }
const obj = obj_to_delete_selector.nextObject(5); const obj = obj_to_delete_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

2
scenarios/s3local.js
View file

@ -131,7 +131,7 @@ export function obj_write() {
export function obj_read() { export function obj_read() {
if(obj_to_read_selector) { if(obj_to_read_selector) {
const obj = obj_to_read_selector.nextObject(5); const obj = obj_to_read_selector.nextObject();
if (!obj) { if (!obj) {
return; return;
} }

2
scenarios/verify.js
View file

@ -112,7 +112,7 @@ export function obj_verify() {
sleep(__ENV.SLEEP); sleep(__ENV.SLEEP);
} }
const obj = obj_to_verify_selector.nextObject(5); const obj = obj_to_verify_selector.nextObject();
if (!obj) { if (!obj) {
log.info("All objects have been verified"); log.info("All objects have been verified");
return; return;