You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@storm.apache.org by "Jungtaek Lim (JIRA)" <ji...@apache.org> on 2018/02/06 23:54:00 UTC

[jira] [Comment Edited] (STORM-2937) Overwrite storm-kafka-client 1.x-branch into 1.0.x-branch

    [ https://issues.apache.org/jira/browse/STORM-2937?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16354746#comment-16354746 ] 

Jungtaek Lim edited comment on STORM-2937 at 2/6/18 11:53 PM:
--------------------------------------------------------------

[~erikdw]

That was fairly simple for 1.1.x-branch, whereas I admit that would not be that simple for 1.0.x-branch.

Step to copy:
 # git checkout 1.x-branch
 # mvn clean
 # cd external
 # tar cvfz storm-kafka-client.tar.gz storm-kafka-client
 # mv storm-kafka-client.tar.gz ~
 # ... same for examples/storm-kafka-client-examples ...
 # git checkout 1.0.x-branch
 # git checkout -b {{<branch>}}
 # cd external
 # rm -rf storm-kafka-client
 # cp ~/storm-kafka-client.tar.gz .
 # tar xvfz storm-kafka-client.tar.gz
 # change parent version in storm-kafka-client/pom.xml
 # rm -rf storm-kafka-client.tar.gz
 # ... same for examples/storm-kafka-client-examples ...

Step to iterate "find and apply":
 # mvn clean package -DskipTests (to save time)
 # if it fails from compilation, look at the message and see which classes are missing/methods are missing
 # open browser and open github apache/storm, and find the class from 1.x-branch
 # if the class is just missing, copy the content and create file in IDE (so I was utilizing console/browser/IDE)
 # if the method is missing or method signature is different, open blame from github to find the commit to check whether it is solely modified along with storm-kafka-client. And modify class manually via copying the content.
 # build again (back to 1)

I haven't met the case which storm-kafka-client relies on storm-core which changes are not introduced from storm-kafka-client yet. If there's a case, that's the thing to discuss, since we are porting back other issues as well.


was (Author: kabhwan):
[~erikdw]

That was fairly simple for 1.1.x-branch, whereas I admit that would not be that simple for 1.0.x-branch.

Step to copy:
 # git checkout 1.x-branch
 # mvn clean
 # cd external
 # tar cvfz storm-kafka-client.tar.gz storm-kafka-client
 # mv storm-kafka-client.tar.gz ~
 # ... same for examples/storm-kafka-client-examples ...
 # git checkout 1.1.x-branch
 # git checkout -b {{<branch>}}
 # cd external
 # rm -rf storm-kafka-client
 # cp ~/storm-kafka-client.tar.gz .
 # tar xvfz storm-kafka-client.tar.gz
 # change parent version in storm-kafka-client/pom.xml
 # rm -rf storm-kafka-client.tar.gz
 # ... same for examples/storm-kafka-client-examples ...

 

 

Step to iterate "find and apply":
 # mvn clean package -DskipTests (to save time)
 # if it fails from compilation, look at the message and see which classes are missing/methods are missing
 # open browser and open github apache/storm, and find the class from 1.x-branch
 # if the class is just missing, copy the content and create file in IDE (so I was utilizing console/browser/IDE)
 # if the method is missing or method signature is different, open blame from github to find the commit to check whether it is solely modified along with storm-kafka-client. And modify class manually via copying the content.
 # build again (back to 1)

I haven't met the case which storm-kafka-client relies on storm-core which changes are not introduced from storm-kafka-client yet. If there's a case, that's the thing to discuss, since we are porting back other issues as well.

> Overwrite storm-kafka-client 1.x-branch into 1.0.x-branch
> ---------------------------------------------------------
>
>                 Key: STORM-2937
>                 URL: https://issues.apache.org/jira/browse/STORM-2937
>             Project: Apache Storm
>          Issue Type: Task
>          Components: storm-kafka-client
>    Affects Versions: 1.0.6
>            Reporter: Jungtaek Lim
>            Assignee: Erik Weathers
>            Priority: Blocker
>
> This is to track the effort of syncing up divergence between storm-kafka-client 1.x-branch and 1.0.x-branch so that critical fixes can be go in 1.0.x-branch as well.
> Note that it can modify storm-core as well (unlikely in a backwards-incompatible way but not 100% sure), so we should make a decision whether we allow the change in bugfix version line.
> Linking discussion thread:
> [https://lists.apache.org/thread.html/0451fed132bb982b618d9e0780282a87554f1bc5747827599f276944@%3Cdev.storm.apache.org%3E]



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)