[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[
https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165890#comment-17165890
]
David Capwell commented on CASSANDRA-15967:
---
Adding the following to make this more clear
{code}
$ git diff
diff --git a/doc/source/development/how_to_commit.rst
b/doc/source/development/how_to_commit.rst
index 8b59049876..528ac40ced 100644
--- a/doc/source/development/how_to_commit.rst
+++ b/doc/source/development/how_to_commit.rst
@@ -67,6 +67,23 @@ On trunk:
On any branch:
#. ``git push origin cassandra-3.0 cassandra-3.3 trunk --atomic``
+If the patch is for an older branch, and doesn't impact later branches (such
as trunk), we still need to merge up.
+
+On cassandra-3.0:
+ #. ``git cherry-pick `` (if we have a problem b/c of
CHANGES.txt not merging anymore, we fix it ourselves, in place)
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On cassandra-3.3:
+ #. ``git merge cassandra-3.0 -s ours``
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On trunk:
+ #. ``git merge cassandra-3.3 -s ours``
+ #. ``ant realclean && ant jar build-test`` (rebuild to make sure code
compiles)
+
+On any branch:
+ #. ``git push origin cassandra-3.0 cassandra-3.3 trunk --atomic``
+
{code}
> Add support in jvm dtest to test thrift
> ---
>
> Key: CASSANDRA-15967
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15967
> Project: Cassandra
> Issue Type: Improvement
> Components: Test/dtest
>Reporter: David Capwell
>Assignee: David Capwell
>Priority: Normal
> Fix For: 3.0.22, 3.11.8, 2.2.18
>
>
> In 2.2 and 3.x thrift is supported and can cause problems for the non thrift
> code. To make sure we can test these interactions, need to add support for
> thrift in jvm dtest.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165824#comment-17165824 ] David Capwell commented on CASSANDRA-15967: --- Thanks, didn't know that; will upgrade the doc https://cassandra.apache.org/doc/latest/development/how_to_commit.html > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 3.0.22, 3.11.8, 2.2.18 > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165788#comment-17165788 ] Aleksey Yeschenko commented on CASSANDRA-15967: --- Looks like you guys haven't merged it into trunk (with -s ours). Taking care of it, just remember to always propagate the change all the way to trunk, even as an empty merge commit. > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 3.0.22, 3.11.8, 2.2.18 > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165141#comment-17165141 ] David Capwell commented on CASSANDRA-15967: --- Looks like I didn't break it was broken before the commit: https://app.circleci.com/pipelines/github/dcapwell/cassandra/340/workflows/8f5af50c-930b-49ab-8cbf-e84318015eff/jobs/1694 > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 3.0.22, 3.11.8, 2.2.18 > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17165129#comment-17165129 ] David Capwell commented on CASSANDRA-15967: --- Looks like I broke python dtests for 3.0. I only ran unit/jvm-dtests and neglected to run python dtests; will look to fix this. > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 3.0.22, 3.11.8, 2.2.18 > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17164639#comment-17164639 ] Jon Meredith commented on CASSANDRA-15967: -- +1 from me too (though can't commit). > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 2.2.x, 3.0.x, 3.11.x > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17164529#comment-17164529 ] Alex Petrov commented on CASSANDRA-15967: - +1 > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 2.2.x, 3.0.x, 3.11.x > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17163084#comment-17163084 ] David Capwell commented on CASSANDRA-15967: --- patches for 2.2, 3.0, and 3.11 are submitted; I went with NATIVE starting native and thrift. Tested this patch via a upgrade dtest in CASSANDRA-15970, but will rerun the upgrade tests in circle ci > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 2.2.x, 3.0.x, 3.11.x > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17162966#comment-17162966 ] David Capwell commented on CASSANDRA-15967: --- I will file a ticket for capturing the version. should be trivial to add since we currently have it, but we ignore everything after major.minor. > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 2.2.x, 3.0.x, 3.11.x > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[
https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17162534#comment-17162534
]
Alex Petrov commented on CASSANDRA-15967:
-
I don't have a strong preference whether we have a separate {{THRIFT}} feature,
or will use the existing {{NATIVE}}. I think it's fine to use the existing one,
even. Maybe we need to renamie it from NATIVE to CLIENT or something like that
not to suggest we're enabling _only_ native transport. That said, CQLTester and
ThriftCQLTester are separate in code.
As regards out-of-tree upgrade tests, when we were talking about dtest-api and
writing tests outside main repository, we did want to have some API that would
let us annotate tests with Cassandra versions they'll be running against, and
when they'll be skipped, just like in python dtests. Different versions
sometimes have different behaviour, so this is definitely required. We don't
need to have it right now though, just "eventually".
> Add support in jvm dtest to test thrift
> ---
>
> Key: CASSANDRA-15967
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15967
> Project: Cassandra
> Issue Type: Improvement
> Components: Test/dtest
>Reporter: David Capwell
>Assignee: David Capwell
>Priority: Normal
> Fix For: 2.2.x, 3.0.x, 3.11.x
>
>
> In 2.2 and 3.x thrift is supported and can cause problems for the non thrift
> code. To make sure we can test these interactions, need to add support for
> thrift in jvm dtest.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[jira] [Commented] (CASSANDRA-15967) Add support in jvm dtest to test thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-15967?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17162486#comment-17162486 ] David Capwell commented on CASSANDRA-15967: --- I have this working locally by overloading Feature.NATIVE, if you select native you also get thrift. The main thing I want to make sure we are in-sync on is if this is ok or if we should add a new Feature.THRIFT (which no-op in 4.0)? This does pose a problem though, since thrift was removed all upgrade tests which use thrift can't show the upgrade to 4.0 is success... this may be a great time to also consider tests outside of the cassandra repo. > Add support in jvm dtest to test thrift > --- > > Key: CASSANDRA-15967 > URL: https://issues.apache.org/jira/browse/CASSANDRA-15967 > Project: Cassandra > Issue Type: Improvement > Components: Test/dtest >Reporter: David Capwell >Assignee: David Capwell >Priority: Normal > Fix For: 2.2.x, 3.0.x, 3.11.x > > > In 2.2 and 3.x thrift is supported and can cause problems for the non thrift > code. To make sure we can test these interactions, need to add support for > thrift in jvm dtest. -- This message was sent by Atlassian Jira (v8.3.4#803005) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
