Fixed return code of benchmark command for the case when query results differ from canonical ones (#16192)

Author: iddqdex

ydb/apps/ydb/CHANGELOG.md

@@ -1,4 +1,4 @@
-
+* Fixed return code of command `ydb workload * run --check-canonical` for the case when benchmark query results differ from canonical ones.
 ## 2.20.0 ##
 
 * Added support for dual configuration mode in the `ydb admin cluster config fetch` command, allowing it to handle separate cluster and storage config sections.

ydb/public/lib/ydb_cli/commands/ydb_benchmark.cpp

@@ -488,7 +488,7 @@ int TWorkloadCommandBenchmark::RunBench(TClient* client, NYdbWorkload::IWorkload
         Cout << "Summary table saved in CSV format to " << CsvReportFileName << Endl;
     }
 
-    return queriesWithSomeFails ? EXIT_FAILURE : EXIT_SUCCESS;
+    return (queriesWithSomeFails || queriesWithDiff) ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 void TWorkloadCommandBenchmark::PrintResult(const BenchmarkUtils::TQueryBenchmarkResult& res, IOutputStream& out, const std::string& expected) const {

ydb/tests/olap/lib/ydb_cli.py

@@ -167,7 +167,7 @@ def _process_returncode(self, returncode) -> None:
                     self._init_iter(iter)
                     self.result.iterations[iter].error_message = msg
                     self._add_error(f'Iteration {iter}: {msg}')
-            if returncode != 0 and len([x for x in filter(lambda x: x.error_message, self.result.iterations.values())]) == 0:
+            if returncode != 0 and len([x for x in filter(lambda x: x.error_message or x.warning_message, self.result.iterations.values())]) == 0:
                 self._add_error(f'Invalid return code: {returncode} instead 0. stderr: {self.result.stderr}')
 
         def _load_plan(self, name: str) -> YdbCliHelper.QueryPlan: