Skip to content

Conversation

@pwendell
Copy link
Contributor

Adds an automated hook in the merge script that can close the JIRA,
set the fix versions, and leave a comment on the JIRA indicating the
PR in which it was resolved. This ensures that (a) we always close JIRA's
when issues are merged and (b) there is a link to the pull request in every JIRA.

This requires a python library called jira-client. We could look at embedding this
library in our project, but it seemed simple enough to just gracefully disable this
feature if it is not installed. It can be installed with pip install jira-client.

@AmplabJenkins
Copy link

Merged build triggered.

@AmplabJenkins
Copy link

Merged build started.

@AmplabJenkins
Copy link

Merged build finished. All automated tests passed.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/14515/

@mridulm
Copy link
Contributor

mridulm commented Apr 27, 2014

Not review of the PR, but this is a great addition !
Btw, does it also update the branch(es) that the PR was committed to ?
What about leaving the JIRA unresolved (partial fixes for example)

@pwendell
Copy link
Contributor Author

@mridulm not sure what you mean by "update the branches"? this sets the fix version on the JIRA according to which branches the PR was committed to.

For your second question, right now it always resolves the JIRA, we could probably add a feature to let you post on the JIRA but not resolve it.

@mridulm
Copy link
Contributor

mridulm commented Apr 27, 2014

I meant, depending on which branch it is committed to, update Fix Version in jira ?
Usual expectation is for this field to be appropriately updated : though I am pretty bad at that right now :-)
So if the script does it, beautiful !

@pwendell
Copy link
Contributor Author

Actually it goes the other way - we ask the committer to say what branches it gets merged into, and then we set the fix version on the JIRA based on that.

@pwendell pwendell closed this Apr 27, 2014
@pwendell pwendell reopened this Apr 27, 2014
@mridulm
Copy link
Contributor

mridulm commented Apr 27, 2014

Yes, that is exactly what I was referring to - since the committer specifies the branches to commit to; use that to populate the JIRA field.
If this is being done - then this is lovely change !

@pwendell
Copy link
Contributor Author

Okay I went ahead and merged this.

asfgit pushed a commit that referenced this pull request Apr 27, 2014
Adds an automated hook in the merge script that can close the JIRA,
set the fix versions, and leave a comment on the JIRA indicating the
PR in which it was resolved. This ensures that (a) we always close JIRA's
when issues are merged and (b) there is a link to the pull request in every JIRA.

This requires a python library called `jira-client`. We could look at embedding this
library in our project, but it seemed simple enough to just gracefully disable this
feature if it is not installed. It can be installed with `pip install jira-client`.

Author: Patrick Wendell <[email protected]>

Closes #570 from pwendell/jira-pr-merge and squashes the following commits:

3022b96 [Patrick Wendell] SPARK-1648 Support closing JIRA's as part of merge script.
(cherry picked from commit fe65bee)

Signed-off-by: Patrick Wendell <[email protected]>
@asfgit asfgit closed this in fe65bee Apr 27, 2014
pdeyhim pushed a commit to pdeyhim/spark-1 that referenced this pull request Jun 25, 2014
Adds an automated hook in the merge script that can close the JIRA,
set the fix versions, and leave a comment on the JIRA indicating the
PR in which it was resolved. This ensures that (a) we always close JIRA's
when issues are merged and (b) there is a link to the pull request in every JIRA.

This requires a python library called `jira-client`. We could look at embedding this
library in our project, but it seemed simple enough to just gracefully disable this
feature if it is not installed. It can be installed with `pip install jira-client`.

Author: Patrick Wendell <[email protected]>

Closes apache#570 from pwendell/jira-pr-merge and squashes the following commits:

3022b96 [Patrick Wendell] SPARK-1648 Support closing JIRA's as part of merge script.
gzm55 pushed a commit to MediaV/spark that referenced this pull request Jul 17, 2014
Prompted by a recent thread on the mailing list, I tried and failed to see if Spark can be made independent of log4j. There are a few cases where control of the underlying logging is pretty useful, and to do that, you have to bind to a specific logger.

Instead I propose some tidying that leaves Spark's use of log4j, but gets rid of warnings and should still enable downstream users to switch. The idea is to pipe everything (except log4j) through SLF4J, and have Spark use SLF4J directly when logging, and where Spark needs to output info (REPL and tests), bind from SLF4J to log4j.

This leaves the same behavior in Spark. It means that downstream users who want to use something except log4j should:

- Exclude dependencies on log4j, slf4j-log4j12 from Spark
- Include dependency on log4j-over-slf4j
- Include dependency on another logger X, and another slf4j-X
- Recreate any log config that Spark does, that is needed, in the other logger's config

That sounds about right.

Here are the key changes:

- Include the jcl-over-slf4j shim everywhere by depending on it in core.
- Exclude dependencies on commons-logging from third-party libraries.
- Include the jul-to-slf4j shim everywhere by depending on it in core.
- Exclude slf4j-* dependencies from third-party libraries to prevent collision or warnings
- Added missing slf4j-log4j12 binding to GraphX, Bagel module tests

And minor/incidental changes:

- Update to SLF4J 1.7.5, which happily matches Hadoop 2’s version and is a recommended update over 1.7.2
- (Remove a duplicate HBase dependency declaration in SparkBuild.scala)
- (Remove a duplicate mockito dependency declaration that was causing warnings and bugging me)

Author: Sean Owen <[email protected]>

Closes apache#570 from srowen/SPARK-1071 and squashes the following commits:

52eac9f [Sean Owen] Add slf4j-over-log4j12 dependency to core (non-test) and remove it from things that depend on core.
77a7fa9 [Sean Owen] SPARK-1071: Tidy logging strategy and use of log4j

Conflicts:
	project/SparkBuild.scala
arjunshroff pushed a commit to arjunshroff/spark that referenced this pull request Nov 24, 2020
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