Skip to content

Commit

Permalink
CBQE-5920: fix testware issue
Browse files Browse the repository at this point in the history 
Change-Id: I0d65d58195f80f17b179d55947f97547d07673ab
Reviewed-on: http://review.couchbase.org/c/testrunner/+/136679
Tested-by: Balakumaran G <balakumaran.gopal@couchbase.com>
Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com>
  • Loading branch information
@vikas-getconnect
vikas-getconnect committed Sep 22, 2020
1 parent d4ab544 commit 5b5fa22
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 27 deletions.
24 changes: 12 additions & 12 deletions conf/eventing/eventing_multihandler.conf
View file
Expand Up @@ -25,25 +25,25 @@ eventing.eventing_multihandler.EventingMultiHandler:
test_multiple_handle_multiple_create_only,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=60,deploy_handler=0,worker_count=1,handler_code=handler_code/no_op.js,sequential=False,GROUP=multihandler_multibucket_set2
#test_multiple_handle_multiple_create_only,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=15,num_dst_buckets=14,num_handlers=60,deploy_handler=0,worker_count=1,handler_code=handler_code/no_op.js,sequential=False,GROUP=multihandler_multibucket_set2
## timers handler
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/bucket_op_with_timers.js,sequential=False,num_pause=1,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/bucket_op_with_timers.js,sequential=True,num_pause=5,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/bucket_op_with_timers.js,sequential=True,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/bucket_op_with_timers.js,sequential=False,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/ABO/insert_timer.js,sequential=False,num_pause=1,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert_timer.js,sequential=True,num_pause=5,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/ABO/insert_timer.js,sequential=True,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert_timer.js,sequential=False,num_pause=10,GROUP=multihandler_multibucket
## bucket op handlers
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/delete_doc_bucket_op.js,sequential=False,num_pause=1,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/delete_doc_bucket_op.js,sequential=True,num_pause=5,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/delete_doc_bucket_op.js,sequential=True,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/delete_doc_bucket_op.js,sequential=False,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/ABO/insert.js,sequential=False,num_pause=1,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert.js,sequential=True,num_pause=5,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/ABO/insert.js,sequential=True,num_pause=10,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert.js,sequential=False,num_pause=10,GROUP=multihandler_multibucket
## curl handlers
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/curl/bucket_op_curl_get.js,sequential=False,num_pause=1,curl=True,host=local,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/curl/bucket_op_curl_get.js,sequential=False,num_pause=5,curl=True,host=local,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/curl/timer_op_curl_get.js,sequential=False,num_pause=10,curl=True,host=local,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/curl/timer_op_curl_get.js,sequential=False,num_pause=10,curl=True,host=local,GROUP=multihandler_multibucket_set2
## SBM handlers
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/bucket_op_source_bucket_mutation_with_timer.js,sequential=False,num_pause=1,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/bucket_op_source_bucket_mutation_with_timer.js,sequential=False,num_pause=5,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/bucket_op_with_source_bucket_mutation.js,sequential=False,num_pause=10,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/bucket_op_with_source_bucket_mutation.js,sequential=False,num_pause=10,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/ABO/insert_sbm_timers.js,sequential=False,num_pause=1,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert_sbm_timers.js,sequential=False,num_pause=5,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=10,num_dst_buckets=0,num_handlers=15,deploy_handler=15,worker_count=3,handler_code=handler_code/ABO/insert_sbm.js,sequential=False,num_pause=10,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=15,deploy_handler=10,worker_count=3,handler_code=handler_code/ABO/insert_sbm.js,sequential=False,num_pause=10,source_bucket_mutation=True,GROUP=multihandler_multibucket_set2
## N1ql handlers
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=1,num_dst_buckets=1,num_handlers=1,deploy_handler=1,worker_count=3,handler_code=handler_code/n1ql_op_without_timers.js,sequential=False,num_pause=1,GROUP=multihandler_multibucket
test_multiple_handle_multiple_buckets_preload,nodes_init=4,services_init=kv-eventing-index-n1ql,dataset=default,groups=simple,reset_services=True,skip_cleanup=True,num_src_buckets=5,num_dst_buckets=5,num_handlers=10,deploy_handler=10,worker_count=3,handler_code=handler_code/n1ql_op_without_timers.js,sequential=False,num_pause=5,GROUP=multihandler_multibucket_set2
Expand Down
14 changes: 10 additions & 4 deletions pytests/eventing/advance_bucket_op.py
View file
Expand Up @@ -41,7 +41,9 @@ def test_advance_bucket_op(self):
self.load(self.gens_load, buckets=self.src_bucket, flag=self.item_flag, verify_data=False,
batch_size=self.batch_size)
body = self.create_save_function_body(self.function_name, self.handler_code)
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name})
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name,
"access": "rw"})
self.rest.create_function(body['appname'], body)
self.deploy_function(body)
self.verify_eventing_results(self.function_name, self.docs_per_day * 2016, skip_stats_validation=True)
self.load(self.gens_load, buckets=self.src_bucket, flag=self.item_flag, verify_data=False,
Expand All @@ -56,7 +58,9 @@ def test_advance_bucket_op_with_expiry(self):
# set expiry pager interval
ClusterOperationHelper.flushctl_set(self.master, "exp_pager_stime", 3, bucket=self.src_bucket_name)
body = self.create_save_function_body(self.function_name,self.handler_code)
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name})
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name,
"access": "rw"})
self.rest.create_function(body['appname'], body)
self.deploy_function(body)
self.verify_eventing_results(self.function_name, self.docs_per_day * 2016, skip_stats_validation=True)
self.verify_eventing_results(self.function_name, 0, skip_stats_validation=True)
Expand All @@ -66,7 +70,9 @@ def test_increment_decrement(self):
self.load(self.gens_load, buckets=self.src_bucket, flag=self.item_flag, verify_data=False,
batch_size=self.batch_size)
body = self.create_save_function_body(self.function_name, self.handler_code)
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name})
body['depcfg']['buckets'].append({"alias": self.src_bucket_name, "bucket_name": self.src_bucket_name,
"access": "rw"})
self.rest.create_function(body['appname'], body)
self.deploy_function(body)
self.verify_eventing_results(self.function_name, self.docs_per_day * 2016 + 1, skip_stats_validation=True)
self.verify_counter(self.docs_per_day * 2016)
Expand Down Expand Up @@ -166,4 +172,4 @@ def test_increment_decrement_error(self):
batch_size=self.batch_size, op_type='delete')
# Wait for eventing to catch up with all the deletes mutations and verify results
self.verify_eventing_results(self.function_name, 0, skip_stats_validation=True)
self.undeploy_and_delete_function(body)
self.undeploy_and_delete_function(body)
6 changes: 3 additions & 3 deletions pytests/eventing/eventing_bucket.py
View file
Expand Up @@ -36,9 +36,9 @@ def setUp(self):
self.expiry = 3
handler_code = self.input.param('handler_code', 'bucket_op')
if handler_code == 'bucket_op':
self.handler_code = HANDLER_CODE.DELETE_BUCKET_OP_ON_DELETE
self.handler_code = "handler_code/ABO/insert.js"
elif handler_code == 'bucket_op_with_timers':
self.handler_code = HANDLER_CODE.BUCKET_OPS_WITH_TIMERS
self.handler_code = "handler_code/ABO/insert_timer.js"
elif handler_code == 'bucket_op_with_cron_timers':
self.handler_code = HANDLER_CODE.BUCKET_OPS_WITH_CRON_TIMERS
elif handler_code == 'n1ql_op_with_timers':
Expand All @@ -48,7 +48,7 @@ def setUp(self):
elif handler_code == 'source_bucket_mutation_timers':
self.handler_code = HANDLER_CODE.BUCKET_OP_SOURCE_BUCKET_MUTATION_WITH_TIMERS
else:
self.handler_code = HANDLER_CODE.DELETE_BUCKET_OP_ON_DELETE
self.handler_code = "handler_code/ABO/insert.js"
# index is required for delete operation through n1ql
self.n1ql_node = self.get_nodes_from_services_map(service_type="n1ql")
self.n1ql_helper = N1QLHelper(shell=self.shell, max_verify=self.max_verify, buckets=self.buckets,
Expand Down
6 changes: 3 additions & 3 deletions pytests/eventing/eventing_multihandler.py
View file
Expand Up @@ -19,7 +19,7 @@ def setUp(self):
self.sequential=self.input.param('sequential',True)
self.num_pause=self.input.param('num_pause',0)
self.worker_count=self.input.param('worker_count',1)
self.handler_code=self.input.param('handler_code','handler_code/delete_doc_bucket_op.js')
self.handler_code=self.input.param('handler_code','handler_code/ABO/insert.js')
self.gens_load = self.generate_docs(self.docs_per_day)
quota=(self.num_src_buckets+self.num_dst_buckets)*100+400
self.rest.set_service_memoryQuota(service='memoryQuota', memoryQuota=quota)
Expand Down Expand Up @@ -159,10 +159,10 @@ def test_mix_handlers(self):
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/no_op.js")
#self.deploy_n_handler(self.deploy_handler, sequential=self.sequential)
self.reset_param()
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/delete_doc_bucket_op.js")
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/ABO/insert.js")
#self.deploy_n_handler(self.deploy_handler, sequential=self.sequential)
self.reset_param()
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/bucket_op_with_timers.js")
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/ABO/insert_timer.js")
#self.deploy_n_handler(self.deploy_handler, sequential=self.sequential)
self.reset_param()
self.create_n_handler(self.num_handlers, self.num_src_buckets, self.num_dst_buckets, "handler_code/n1ql_op_without_timers.js")
Expand Down
17 changes: 17 additions & 0 deletions pytests/eventing/handler_code/ABO/insert_sbm_timers.js
View file
@@ -0,0 +1,17 @@
function OnUpdate(doc,meta) {
var expiry = new Date();
expiry.setSeconds(expiry.getSeconds() + 180);
var time_rand = random_gen();
var doc_id = meta.id+'_'+time_rand;
var context = {docID : doc_id, random_text : "e6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh07Aumoe6cZZGHuh07Aumoe6cZZGHuh07Aumoe6"};
createTimer(DocTimerCallback, expiry, meta.id, context);
}
function DocTimerCallback(context) {
var result= couchbase.insert(dst_bucket,{"id":context.docID},context.random_text);
log(result);
}
function random_gen(){
var rand = Math.floor(Math.random() * 20000000) * Math.floor(Math.random() * 20000000);
var time_rand = Math.round((new Date()).getTime() / 1000) + rand;
return time_rand;
}
8 changes: 3 additions & 5 deletions pytests/eventing/handler_code/ABO/insert_timer.js
View file
@@ -1,21 +1,20 @@
function OnUpdate(doc, meta) {
log("Doc created/updated", meta.id);
var expiry = new Date();
expiry.setSeconds(expiry.getSeconds() + 5);
expiry.setSeconds(expiry.getSeconds() + 3);

var context = {docID : meta.id, random_text : "e6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh0R7Aumoe6cZZGHuh07Aumoe6cZZGHuh07Aumoe6cZZGHuh07Aumoe6"};
createTimer(timerCallback, expiry, meta.id, context);
}

function timerCallback(context) {
var result= couchbase.insert(dst_bucket,{"id":context.docID},context.random_tex);
var result= couchbase.insert(dst_bucket,{"id":context.docID},context.random_text);
log(result);
}

function OnDelete(meta) {
var expiry = new Date();
expiry.setSeconds(expiry.getSeconds() + 5);

expiry.setSeconds(expiry.getSeconds() + 30);
var context = {docID : meta.id };
createTimer(NDtimerCallback, expiry, meta.id, context);
}
Expand All @@ -25,4 +24,3 @@ function NDtimerCallback(context) {
var result = couchbase.delete(dst_bucket,meta);
log(result);
}

0 comments on commit 5b5fa22

Please sign in to comment.