Skip to content

Commit 286752e

Browse files
sanyavashistsaimirra-ramesh
sanyavashist
authored and
saimirra-ramesh
committed
Totoro Regression Fixes
Change-Id: I2c585698438be323ab13644d38ecf80d74a98c82 Reviewed-on: https://review.couchbase.org/c/testrunner/+/245056 Tested-by: Saimirra R <saimirra.r@couchbase.com> Reviewed-by: Saimirra R <saimirra.r@couchbase.com>
1 parent f14aec2 commit 286752e

4 files changed

Lines changed: 38 additions & 34 deletions

File tree

‎pytests/eventing/eventing_failover.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def setUp(self):
5151
self.rest.diag_eval("ns_config:set(force_disable_new_orchestration, true).")
5252
self.is_encryption = self.input.param('is_encryption', False)
5353
if getattr(self, 'is_fts', False):
54-
self.fts_index_name = "travel-sample._default.travel_sample_test"
54+
self.fts_index_name = "travel_sample_test"
5555
self.fts_doc_count = 31500
5656
self.fts_callable = FTSCallable(nodes=self.servers, es_validate=False)
5757
self.fts_memory_quota = 3000
@@ -118,12 +118,12 @@ def test_vb_shuffle_during_failover(self):
118118
self.load_sample_buckets(self.master, "travel-sample")
119119
self.sleep(60, "Waiting for travel-sample bucket to load and replicate")
120120
plan_params = {"indexPartitions": 1, "numReplicas": 0}
121-
fts_index = self.fts_callable.create_default_index(
121+
self.fts_index = self.fts_callable.create_default_index(
122122
index_name=self.fts_index_name,
123123
bucket_name="travel-sample",
124124
plan_params=plan_params
125125
)
126-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
126+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
127127
self.sleep(30, "Waiting for FTS indexing to complete")
128128
eventing_server = self.get_nodes_from_services_map(service_type="eventing", get_all_nodes=True)
129129
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
@@ -201,12 +201,12 @@ def test_vb_shuffle_during_failover_rebalance(self):
201201
self.load_sample_buckets(self.master, "travel-sample")
202202
self.sleep(60, "Waiting for travel-sample bucket to load and replicate")
203203
plan_params = {"indexPartitions": 1, "numReplicas": 0}
204-
fts_index = self.fts_callable.create_default_index(
204+
self.fts_index = self.fts_callable.create_default_index(
205205
index_name=self.fts_index_name,
206206
bucket_name="travel-sample",
207207
plan_params=plan_params
208208
)
209-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
209+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
210210
self.sleep(30, "Waiting for FTS indexing to complete")
211211
eventing_server = self.get_nodes_from_services_map(service_type="eventing", get_all_nodes=True)
212212
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
@@ -350,12 +350,12 @@ def test_multiple_eventing_failover_with_failover_running(self):
350350
self.load_sample_buckets(self.master, "travel-sample")
351351
self.sleep(60, "Waiting for travel-sample bucket to load and replicate")
352352
plan_params = {"indexPartitions": 1, "numReplicas": 0}
353-
fts_index = self.fts_callable.create_default_index(
353+
self.fts_index = self.fts_callable.create_default_index(
354354
index_name=self.fts_index_name,
355355
bucket_name="travel-sample",
356356
plan_params=plan_params
357357
)
358-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
358+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
359359
self.sleep(30, "Waiting for FTS indexing to complete")
360360
eventing_server = self.get_nodes_from_services_map(service_type="eventing", get_all_nodes=True)
361361
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
@@ -606,14 +606,15 @@ def run_fts_validation(self):
606606
log.info("Running FTS validation...")
607607
bucket = "travel-sample"
608608
scope = "_default"
609+
index_name = self.fts_index.name if getattr(self, "fts_index", None) else self.fts_index_name
609610

610611
fts_query = self.construct_fts_query(
611-
self.fts_index_name,
612+
index_name,
612613
self.fts_query['query']
613614
)
614615

615616
hits, _, _, _ = self.fts_callable.run_fts_query(
616-
index_name=self.fts_index_name,
617+
index_name=index_name,
617618
query_dict=fts_query,
618619
bucket_name=bucket,
619620
scope_name=scope,

‎pytests/eventing/eventing_rebalance.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def setUp(self):
9999
self.dek_rotation_interval = self.input.param('dek_rotation_interval', 60)
100100
# FTS setup
101101
if getattr(self, 'is_fts', False):
102-
self.fts_index_name = "travel-sample._default.travel_sample_test"
102+
self.fts_index_name = "travel_sample_test"
103103
self.fts_doc_count = 31500
104104
self.fts_callable = FTSCallable(nodes=self.servers, es_validate=False)
105105
self.fts_memory_quota = 3000
@@ -160,12 +160,12 @@ def test_eventing_rebalance_in_when_existing_eventing_node_is_processing_mutatio
160160
self.load_sample_buckets(self.master, "travel-sample")
161161
self.sleep(60, "Waiting for travel-sample bucket to load")
162162
plan_params = {"indexPartitions": 1, "numReplicas": 0}
163-
fts_index = self.fts_callable.create_default_index(
163+
self.fts_index = self.fts_callable.create_default_index(
164164
index_name=self.fts_index_name,
165165
bucket_name="travel-sample",
166166
plan_params=plan_params
167167
)
168-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
168+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
169169
sock_batch_size = self.input.param('sock_batch_size', 1)
170170
worker_count = self.input.param('worker_count', 3)
171171
cpp_worker_thread_count = self.input.param('cpp_worker_thread_count', 1)
@@ -254,12 +254,12 @@ def test_eventing_rebalance_out_when_existing_eventing_node_is_processing_mutati
254254
self.load_sample_buckets(self.master, "travel-sample")
255255
self.sleep(60, "Waiting for travel-sample bucket to load")
256256
plan_params = {"indexPartitions": 1, "numReplicas": 0}
257-
fts_index = self.fts_callable.create_default_index(
257+
self.fts_index = self.fts_callable.create_default_index(
258258
index_name=self.fts_index_name,
259259
bucket_name="travel-sample",
260260
plan_params=plan_params
261261
)
262-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
262+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
263263
self.sleep(30, "Waiting for FTS indexing to complete")
264264
sock_batch_size = self.input.param('sock_batch_size', 1)
265265
worker_count = self.input.param('worker_count', 3)
@@ -514,12 +514,12 @@ def test_kv_swap_rebalance_when_existing_eventing_node_is_processing_mutations(s
514514
self.load_sample_buckets(self.master, "travel-sample")
515515
self.sleep(60, "Waiting for travel-sample bucket to load")
516516
plan_params = {"indexPartitions": 1, "numReplicas": 0}
517-
fts_index = self.fts_callable.create_default_index(
517+
self.fts_index = self.fts_callable.create_default_index(
518518
index_name=self.fts_index_name,
519519
bucket_name="travel-sample",
520520
plan_params=plan_params
521521
)
522-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
522+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
523523
self.sleep(30, "Waiting for FTS indexing to complete")
524524
sock_batch_size = self.input.param('sock_batch_size', 1)
525525
worker_count = self.input.param('worker_count', 3)
@@ -2014,14 +2014,15 @@ def run_fts_validation(self):
20142014
log.info("Running FTS validation...")
20152015
bucket = "travel-sample"
20162016
scope = "_default"
2017+
index_name = self.fts_index.name if getattr(self, "fts_index", None) else self.fts_index_name
20172018

20182019
fts_query = self.construct_fts_query(
2019-
self.fts_index_name,
2020+
index_name,
20202021
self.fts_query['query']
20212022
)
20222023

20232024
hits, _, _, _ = self.fts_callable.run_fts_query(
2024-
index_name=self.fts_index_name,
2025+
index_name=index_name,
20252026
query_dict=fts_query,
20262027
bucket_name=bucket,
20272028
scope_name=scope,

‎pytests/eventing/eventing_recovery.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def setUp(self):
8282
ClusterOperationHelper.flushctl_set(self.master, "exp_pager_stime", 60, bucket=self.src_bucket_name)
8383
# FTS Setup
8484
if getattr(self, 'is_fts', False):
85-
self.fts_index_name = "travel-sample._default.travel_sample_test"
85+
self.fts_index_name = "travel_sample_test"
8686
self.fts_doc_count = 31500
8787
self.fts_callable = FTSCallable(nodes=self.servers, es_validate=False)
8888
self.fts_memory_quota = 3000
@@ -149,12 +149,12 @@ def test_killing_eventing_consumer_when_eventing_is_processing_mutations(self):
149149
if getattr(self, 'is_fts', False):
150150
self.load_sample_buckets(self.server, "travel-sample")
151151
plan_params = {"indexPartitions": 1, "numReplicas": 0}
152-
fts_index = self.fts_callable.create_default_index(
152+
self.fts_index = self.fts_callable.create_default_index(
153153
index_name=self.fts_index_name,
154154
bucket_name="travel-sample",
155155
plan_params=plan_params
156156
)
157-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
157+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
158158
self.sleep(30, "Waiting for FTS indexing to complete")
159159
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
160160
if self.is_curl:
@@ -261,12 +261,12 @@ def test_killing_eventing_producer_when_eventing_is_processing_mutations(self):
261261
if getattr(self, 'is_fts', False):
262262
self.load_sample_buckets(self.server, "travel-sample")
263263
plan_params = {"indexPartitions": 1, "numReplicas": 0}
264-
fts_index = self.fts_callable.create_default_index(
264+
self.fts_index = self.fts_callable.create_default_index(
265265
index_name=self.fts_index_name,
266266
bucket_name="travel-sample",
267267
plan_params=plan_params
268268
)
269-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
269+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
270270
self.sleep(30, "Waiting for FTS indexing to complete")
271271
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
272272
if self.is_curl:
@@ -1414,12 +1414,12 @@ def test_is_balanced_after_stopping_couchbase_server(self):
14141414
if getattr(self, 'is_fts', False):
14151415
self.load_sample_buckets(self.server, "travel-sample")
14161416
plan_params = {"indexPartitions": 1, "numReplicas": 0}
1417-
fts_index = self.fts_callable.create_default_index(
1417+
self.fts_index = self.fts_callable.create_default_index(
14181418
index_name=self.fts_index_name,
14191419
bucket_name="travel-sample",
14201420
plan_params=plan_params
14211421
)
1422-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
1422+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
14231423
self.sleep(30, "Waiting for FTS indexing to complete")
14241424
body = self.create_save_function_body(self.function_name,self.handler_code, jwt_token=jwt_token)
14251425
# load some data
@@ -1598,14 +1598,15 @@ def run_fts_validation(self):
15981598
log.info("Running FTS validation...")
15991599
bucket = "travel-sample"
16001600
scope = "_default"
1601+
index_name = self.fts_index.name if getattr(self, "fts_index", None) else self.fts_index_name
16011602

16021603
fts_query = self.construct_fts_query(
1603-
self.fts_index_name,
1604+
index_name,
16041605
self.fts_query['query']
16051606
)
16061607

16071608
hits, _, _, _ = self.fts_callable.run_fts_query(
1608-
index_name=self.fts_index_name,
1609+
index_name=index_name,
16091610
query_dict=fts_query,
16101611
bucket_name=bucket,
16111612
scope_name=scope,

‎pytests/eventing/eventing_security.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def setUp(self):
5252

5353
# FTS setup
5454
if getattr(self, 'is_fts', False):
55-
self.fts_index_name = "travel-sample._default.travel_sample_test"
55+
self.fts_index_name = "travel_sample_test"
5656
self.fts_doc_count = 31500
5757
self.fts_callable = FTSCallable(nodes=self.servers, es_validate=False)
5858
self.fts_memory_quota = 3000
@@ -120,12 +120,12 @@ def test_eventing_with_n2n_encryption_enabled(self):
120120
if getattr(self, 'is_fts', False):
121121
self.load_sample_buckets(self.server, "travel-sample")
122122
plan_params = {"indexPartitions": 1, "numReplicas": 0}
123-
fts_index = self.fts_callable.create_default_index(
123+
self.fts_index = self.fts_callable.create_default_index(
124124
index_name=self.fts_index_name,
125125
bucket_name="travel-sample",
126126
plan_params=plan_params
127127
)
128-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
128+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
129129
self.sleep(30, "Waiting for FTS indexing to complete")
130130
ntonencryptionBase().disable_nton_cluster([self.master])
131131
self.sleep(120)
@@ -206,12 +206,12 @@ def test_eventing_with_enforce_tls_feature(self):
206206
if getattr(self, 'is_fts', False):
207207
self.load_sample_buckets(self.server, "travel-sample")
208208
plan_params = {"indexPartitions": 1, "numReplicas": 0}
209-
fts_index = self.fts_callable.create_default_index(
209+
self.fts_index = self.fts_callable.create_default_index(
210210
index_name=self.fts_index_name,
211211
bucket_name="travel-sample",
212212
plan_params=plan_params
213213
)
214-
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=fts_index)
214+
self.fts_callable.wait_for_indexing_complete(item_count=self.fts_doc_count, idx=self.fts_index)
215215
self.sleep(30, "Waiting for FTS indexing to complete")
216216
ntonencryptionBase().disable_nton_cluster([self.master])
217217
body = self.create_save_function_body(self.function_name, self.handler_code, jwt_token=jwt_token)
@@ -444,14 +444,15 @@ def run_fts_validation(self):
444444
log.info("Running FTS validation...")
445445
bucket = "travel-sample"
446446
scope = "_default"
447+
index_name = self.fts_index.name if getattr(self, "fts_index", None) else self.fts_index_name
447448

448449
fts_query = self.construct_fts_query(
449-
self.fts_index_name,
450+
index_name,
450451
self.fts_query['query']
451452
)
452453

453454
hits, _, _, _ = self.fts_callable.run_fts_query(
454-
index_name=self.fts_index_name,
455+
index_name=index_name,
455456
query_dict=fts_query,
456457
bucket_name=bucket,
457458
scope_name=scope,

0 commit comments

Comments
 (0)