Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from main to native_cql_changes #615

Merged

Conversation

tatu-at-datastax
Copy link
Contributor

What this PR does:

Merges changes from main to native_cql_changes branch

Which issue(s) this PR fixes:
N/A

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

@tatu-at-datastax tatu-at-datastax marked this pull request as ready for review November 2, 2023 23:45
@tatu-at-datastax tatu-at-datastax requested a review from a team as a code owner November 2, 2023 23:45
@Yuqi-Du
Copy link
Contributor

Yuqi-Du commented Nov 3, 2023

I am seeing MeteredCommandProcessorTest 3 unit tests failing. But it seems that they also fail in native_cql_changes branch.

Integration Tests all passed.

@tatu-at-datastax
Copy link
Contributor Author

I am seeing MeteredCommandProcessorTest 3 unit tests failing. But it seems that they also fail in native_cql_changes branch.

Integration Tests all passed.

I see 4th failure which may be due to merge:

[ERROR] Failures: 
[ERROR]   ThrowableCommandResultSupplierTest$Get.authenticationError:104 
[List check single element] (1 failure)
-- failure 1 --
expected: "UNAUTHENTICATED: Invalid token"
 but was: "UNAUTHENTICATED"

@Yuqi-Du
Copy link
Contributor

Yuqi-Du commented Nov 3, 2023

I am seeing MeteredCommandProcessorTest 3 unit tests failing. But it seems that they also fail in native_cql_changes branch.
Integration Tests all passed.

I see 4th failure which may be due to merge:

[ERROR] Failures: 
[ERROR]   ThrowableCommandResultSupplierTest$Get.authenticationError:104 
[List check single element] (1 failure)
-- failure 1 --
expected: "UNAUTHENTICATED: Invalid token"
 but was: "UNAUTHENTICATED"

Could you please pull again. I think I fixed this yesterday

@tatu-at-datastax
Copy link
Contributor Author

I am seeing MeteredCommandProcessorTest 3 unit tests failing. But it seems that they also fail in native_cql_changes branch.
Integration Tests all passed.

I see 4th failure which may be due to merge:

[ERROR] Failures: 
[ERROR]   ThrowableCommandResultSupplierTest$Get.authenticationError:104 
[List check single element] (1 failure)
-- failure 1 --
expected: "UNAUTHENTICATED: Invalid token"
 but was: "UNAUTHENTICATED"

Could you please pull again. I think I fixed this yesterday

Ah. Yes, I see that one, thank you!

@tatu-at-datastax tatu-at-datastax changed the title DRAFT: try to merge changes from main to native_cql_changes -- 1 comflict DRAFT: try to merge changes from main to native_cql_changes Nov 3, 2023
@tatu-at-datastax
Copy link
Contributor Author

@maheshrajamani @kathirsvn Any concerns? Not sure why checks are not running (I guess CI does not pick up this PR somehow), but there are 3 unit test failures:

[ERROR] Failures: 
[ERROR]   MeteredCommandProcessorTest$CustomMetrics.errorMetrics:177 
Multiple Failures (1 failure)
-- failure 1 --
expected: 3
 but was: 76
[ERROR]   MeteredCommandProcessorTest$CustomMetrics.errorMetricsWithNoErrorCode:123 
Multiple Failures (1 failure)
-- failure 1 --
expected: 3
 but was: 76
[ERROR]   MeteredCommandProcessorTest$CustomMetrics.metrics:72 
Multiple Failures (1 failure)
-- failure 1 --
expected: 3
 but was: 76
[INFO] 
[ERROR] Tests run: 645, Failures: 3, Errors: 0, Skipped: 18

@maheshrajamani
Copy link
Contributor

errorMetrics
@tatu-at-datastax
We have added histogram percentile metrics for command_processor_process, that adds entries to the meters. We need to add additional filter like !line.contains("quantile")

@tatu-at-datastax
Copy link
Contributor Author

errorMetrics
@tatu-at-datastax
We have added histogram percentile metrics for command_processor_process, that adds entries to the meters. We need to add additional filter like !line.contains("quantile")

Looks like one possible filter that removes new bucketed entries is:

    && !line.contains("seconds_bucket")

Thanks!

@tatu-at-datastax tatu-at-datastax changed the title DRAFT: try to merge changes from main to native_cql_changes Mmerge changes from main to native_cql_changes Nov 3, 2023
@tatu-at-datastax tatu-at-datastax changed the title Mmerge changes from main to native_cql_changes Merge changes from main to native_cql_changes Nov 3, 2023
@tatu-at-datastax
Copy link
Contributor Author

Ok, so:

  • Unit tests pass (locally and on CI)
  • Integration tests pass locally
  • Integration tests fail on CI

since CI was not yet enabled for native_cql_changes branch I think there's no new breakage so I will go ahead and merge (couldn't see an obvious fix to solve the issue, need more time).

@tatu-at-datastax tatu-at-datastax merged commit 54f9c34 into native_cql_changes Nov 3, 2023
1 of 3 checks passed
@tatu-at-datastax tatu-at-datastax deleted the main-to-native_cql_changes-merge branch November 3, 2023 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants