CBPS-984: collect logs after tools tests

- Set log_file option on all cbimport/cbexport tests
- Enable cbimport/cbexport logging by supplying --verbose alongside
--log-file
- Don't run cbbackupmgr collect-logs redundantly for cbimport/cbexport
tests
- Run cbbackupmgr collect-logs on all cbbackupmgr tests (most of them
were already doing it)

Change-Id: Iceca27da8ef4c006a14f8a703323a8d536bb44f2
Reviewed-on: https://review.couchbase.org/c/perfrunner/+/169454
Tested-by: Build Bot <[email protected]>
Reviewed-by: Korrigan Clark <[email protected]>

Author: d-nagy

perfrunner/helpers/local.py

@@ -329,7 +329,7 @@ def cbexport(master_node: str, cluster_spec: ClusterSpec, bucket: str,
                  '--scope-field {}'.format(scope_field),
                  '--threads {}'.format(threads) if threads else None,
                  '--include-key key',
-                 '--log-file {}'.format(log_file) if log_file else None]
+                 '--verbose --log-file {}'.format(log_file) if log_file else None]
 
     else:
         flags = ['--format {}'.format(data_format),
@@ -340,7 +340,7 @@ def cbexport(master_node: str, cluster_spec: ClusterSpec, bucket: str,
                  '--password {}'.format(cluster_spec.rest_credentials[1]),
                  '--threads {}'.format(threads) if threads else None,
                  '--include-key {}'.format(key_field) if key_field else None,
-                 '--log-file {}'.format(log_file) if log_file else None]
+                 '--verbose --log-file {}'.format(log_file) if log_file else None]
 
     cmd = './opt/couchbase/bin/cbexport json {}'.format(
         ' '.join(filter(None, flags)))
@@ -381,7 +381,7 @@ def cbimport(master_node: str, cluster_spec: ClusterSpec, bucket: str,
                  '--infer-types' if infer_types else None,
                  '--omit-empty' if omit_empty else None,
                  '--errors-log {}'.format(errors_log) if errors_log else None,
-                 '--log-file {}'.format(log_file) if log_file else None]
+                 '--verbose --log-file {}'.format(log_file) if log_file else None]
 
     else:
 
@@ -401,7 +401,7 @@ def cbimport(master_node: str, cluster_spec: ClusterSpec, bucket: str,
                  '--infer-types' if infer_types else None,
                  '--omit-empty' if omit_empty else None,
                  '--errors-log {}'.format(errors_log) if errors_log else None,
-                 '--log-file {}'.format(log_file) if log_file else None,
+                 '--verbose --log-file {}'.format(log_file) if log_file else None,
                  '--scope-collection-exp {}'.format(scope_collection_exp)]
 
     cmd = './opt/couchbase/bin/cbimport {} {}'.format(

perfrunner/tests/tools.py

@@ -149,7 +149,11 @@ def run(self):
         self.check_num_items()
         self.compact_bucket(wait=True)
 
-        time_elapsed = self.backup()
+        try:
+            time_elapsed = self.backup()
+        finally:
+            self.collectinfo()
+
         self.report_kpi(time_elapsed)
 
 
@@ -232,7 +236,10 @@ def run(self):
 
         self.access_bg()
 
-        time_elapsed = self.backup()
+        try:
+            time_elapsed = self.backup()
+        finally:
+            self.collectinfo()
 
         self.report_kpi(time_elapsed)
 
@@ -433,7 +440,12 @@ def run(self):
 
         self.backup()
         self.flush_buckets()
-        time_elapsed = self.restore()
+
+        try:
+            time_elapsed = self.restore()
+        finally:
+            self.collectinfo()
+
         self.report_kpi(time_elapsed)
 
 
@@ -530,10 +542,7 @@ def export(self):
     def run(self):
         super().run()
 
-        try:
-            time_elapsed = self.export()
-        finally:
-            self.collectinfo()
+        time_elapsed = self.export()
 
         self.report_kpi(time_elapsed)
 
@@ -552,10 +561,7 @@ def run(self):
 
         self.flush_buckets()
 
-        try:
-            time_elapsed = self.import_data()
-        finally:
-            self.collectinfo()
+        time_elapsed = self.import_data()
 
         self.report_kpi(time_elapsed)
 
@@ -571,10 +577,7 @@ def run(self):
         self.extract_tools()
         self.get_tool_versions()
 
-        try:
-            time_elapsed = self.import_data()
-        finally:
-            self.collectinfo()
+        time_elapsed = self.import_data()
 
         self.report_kpi(time_elapsed)
 
@@ -633,7 +636,11 @@ def run(self):
         if self.test_config.compaction.bucket_compaction == 'true':
             self.compact_bucket(wait=True)
 
-        time_elapsed = self.backup()
+        try:
+            time_elapsed = self.backup()
+        finally:
+            self.extract_tools()
+            self.collectinfo()
 
         self.report_kpi(time_elapsed)
 
@@ -707,6 +714,10 @@ def run(self):
 
         self.flush_buckets()
 
-        time_elapsed = self.restore()
+        try:
+            time_elapsed = self.restore()
+        finally:
+            self.extract_tools()
+            self.collectinfo()
 
         self.report_kpi(time_elapsed)

scripts/upload_info.sh

@@ -1,6 +1,7 @@
 #!/bin/bash +x
 
 for FILE in *.zip; do
+    [ -f "$FILE" ] || continue
     env/bin/aws s3 cp --quiet ${FILE} s3://perf-artifacts/${BUILD_TAG}/${FILE}
     echo "https://s3-us-west-2.amazonaws.com/perf-artifacts/${BUILD_TAG}/${FILE}"
 done

tests/collections/tools/tools_export_60M_json_lines_1s_1000c.test

@@ -31,3 +31,4 @@ threads = 16
 format = lines
 collection_field = collection
 scope_field = scope
+log_file = cbexport.log

tests/collections/tools/tools_export_60M_json_lines_1s_1c.test

@@ -31,3 +31,4 @@ threads = 16
 format = lines
 collection_field = collection
 scope_field = scope
+log_file = cbexport.log

tests/collections/tools/tools_import_3M_20K_json_list_1s_1c.test

@@ -33,3 +33,4 @@ type = json
 collection_field = collection
 scope_field = scope
 scope_collection_exp = scope-1.collection-1
+log_file = cbimport.log

tests/collections/tools/tools_import_60M_json_lines_1s_1c.test

@@ -33,3 +33,4 @@ type = json
 collection_field = collection
 scope_field = scope
 scope_collection_exp = scope-1.collection-1
+log_file = cbimport.log

tests/tools_export_60M_json_lines.test

@@ -26,6 +26,7 @@ doc_gen = import_export_simple
 [export]
 threads = 16
 format = lines
+log_file = cbexport.log
 
 [clients]
 libcouchbase = 2.9.3

tests/tools_export_60M_json_list.test

@@ -26,6 +26,7 @@ doc_gen = import_export_simple
 [export]
 threads = 16
 format = list
+log_file = cbexport.log
 
 [clients]
 libcouchbase = 2.9.3

tests/tools_import_3M_20K_json_list.test

@@ -27,6 +27,7 @@ doc_gen = import_export_simple
 threads = 16
 format = list
 type = json
+log_file = cbimport.log
 
 [clients]
 libcouchbase = 2.9.3