Skip to content

Branch 0.6 #4

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.

Sign up for GitHub

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

Jump to bottom
Closed
ljl1988com wants to merge 208 commits into from
Closed

Branch 0.6 #4

ljl1988com wants to merge 208 commits into from

Conversation

@ljl1988com
Copy link

@ljl1988com ljl1988com commented Dec 29, 2014

No description provided.

@hiteshs
Copy link
Member

hiteshs commented Dec 29, 2014

Hi @ljl1988com the four commits you are trying to request a merge for should already be in both master and branch 0.6. They will have different commit-ids as they were cherry-picked into the 0.6 branch.

jteagles and others added 25 commits January 6, 2015 12:56
@jteagles
TEZ-1891. Incorrect number of Javadoc warnings reported (jeagles)
a5db290
@jteagles
TEZ-1907. Fix javadoc warnings in tez codebase (jeagles)
72ac296
@jteagles
TEZ-1915. Add public key to KEYS (jeagles)
47ddee9 
(cherry picked from commit 1023469)
TEZ-1882. Tez UI build does not work on Windows (Prakash Ramachandran…
30d485d 
… via bikas)

(cherry picked from commit b9c834a)
@hiteshs
TEZ-1924. Tez AM does not register with AM with full FQDN causing job…
635db36 
…s to fail in some environments. (Ivan Mitic via hitesh)

(cherry picked from commit f4be193)
@hiteshs
TEZ-1910. Build fails against hadoop-2.2.0. (hitesh)
031ddf2 
(cherry picked from commit 751c8c3)
@jteagles
TEZ-1925. Remove npm WARN messages from the Tez UI build process. (je…
6125f5d 
…agles)

(cherry picked from commit be665e7)
@jteagles
TEZ-1938. Build warning duplicate jersey-json definitions (jeagles)
9939cb0 
(cherry picked from commit 4c4bcdd)
@hiteshs
TEZ-1931. Publish tez version info to Timeline. (hitesh)
7738a92 
(cherry picked from commit d6d03f9)
@hiteshs
TEZ-1931. Publish tez version info to Timeline. (hitesh)
c3bfae1 
(cherry picked from commit 9fb863e)
@hiteshs
TEZ-1931. Publish tez version info to Timeline. (hitesh)
0db6103 
(cherry picked from commit 6bc500f)
@jteagles
TEZ-1890. tez-ui web.tar.gz also being uploaded to maven repository (…
0e872a5 
…jeagles)

(cherry picked from commit adcfb84)
@sidseth
TEZ-1962. Fix a thread leak in LocalMode. (sseth)
8bf99a8
@jteagles
TEZ-1968. Tez UI - All vertices of DAG are not listed in vertices pag…
797335c 
…e (Prakash Ramachandran via jeagles)

(cherry picked from commit fb2cb86)
@hiteshs
TEZ-1942. Number of tasks show in Tez UI with auto-reduce parallelism…
a590516 
… is misleading. (Prakash Ramachandran via hitesh)

(cherry picked from commit 2ff8c94)
@t3rmin4t0r
TEZ-1949: Whitelist TEZ_RUNTIME_OPTIMIZE_SHARED_FETCH for broadcast e…
b80fe2d 
…dges. (gopalv)

(cherry picked from commit d676ef2)

Conflicts:
	CHANGES.txt
@hiteshs
TEZ-1931. Update CHANGES.txt to reflect final fix version.
ce9668e 
(cherry picked from commit 743f77f)
@jteagles
TEZ-1977. Fixup CHANGES.txt with Tez UI jiras (jeagles)
83e5307 
(cherry picked from commit dd1ac64)
@jteagles
TEZ-1977. Fixup CHANGES.txt with Tez UI jiras (jeagles)
9361cc0 
(cherry picked from commit 00b1fe4)
@jteagles
TEZ-1977. Fixup CHANGES.txt with Tez UI jiras (jeagles)
7d69a6e 
(cherry picked from commit ca45330)
@jteagles
Adding 0.6.1 Release
acb8711
@jteagles
TEZ-1983. Tez UI swimlane task attempt link is broken (jeagles)
b14e639 
(cherry picked from commit 59ca1f0)
@zjffdu
Update CHANGES.txt: Move TEZ-1642,TEZ-1934 to 0.5.4 (zjffdu)
c206223
TEZ-1987. Tez UI non-standalone mode uses invalid protocol (Sreenath …
1d56179 
…Somarajapuram via rbalamohan)

(cherry picked from commit 713bfb1)

Conflicts:
	CHANGES.txt
TEZ-1946. Tez UI: add source & sink views, add counters to vertices/a…
20689e8 
…ll task views (Sreenath Somarajapuram via rbalamohan)

(cherry picked from commit 3a45508)
sidseth and others added 24 commits August 21, 2015 17:10
@sidseth
TEZ-2734. Add a test to verify the filename generated by OnDiskMerge.…
ed16317 
… (sseth)
@rbalamohan
TEZ-2290. Scale memory for Default Sorter down to a max of 2047 MB if…
c27cc58 
… configured higher (rbalamohan)
@rbalamohan
TEZ-2732. DefaultSorter throws ArrayIndex exceptions on 2047 Mb size …
253e8de 
…sort buffers (rbalamohan)
TEZ-2742. VertexImpl.finished() terminationCause hides member var of …
740ed2d 
…the same name (bikas)

(cherry picked from commit e5a79fd)

Conflicts:
	CHANGES.txt
@rbalamohan
TEZ-2290. Adding addendum patch (rbalamohan)
a1d7cda
TEZ-2752. logUnsuccessful completion in Attempt should write original…
f8cabdc 
… finish time to ATS (bikas)

(cherry picked from commit 996906d)

Conflicts:
	CHANGES.txt
	tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
(cherry picked from commit ccfc16b)

Conflicts:
	CHANGES.txt
	tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
	tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskAttempt.java
@zjffdu
TEZ-2745. ClassNotFoundException of user code should fail dag (zjffdu)
bc56e10 
(cherry picked from commit c644e6d)

Conflicts:
	CHANGES.txt
	tez-api/src/main/java/org/apache/tez/client/FrameworkClient.java
	tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/DAGImpl.java
	tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/Edge.java
	tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/VertexManager.java
	tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestEdge.java
	tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java
	tez-dag/src/test/java/org/apache/tez/dag/history/events/TestHistoryEventsProtoConversion.java
	tez-runtime-internals/src/main/java/org/apache/tez/runtime/LogicalIOProcessorRuntimeTask.java
@hiteshs
TEZ-2768. Log a useful error message when the summary stream cannot b…
3b61bee 
…e closed when shutting down an AM. (Jeff Zhang via hitesh)
TEZ-2809. Minimal distribution compiled on 2.6 fails to run on 2.7
addae16 
(cherry picked from commit b288be7)
TEZ-814. Improve heuristic for determining a task has failed outputs …
b16b9b1 
…(bikas)

(cherry picked from commit 94488e7)

Conflicts:
	CHANGES.txt
(cherry picked from commit 94e256d)
TEZ-2816. Preemption sometimes does not respect heartbeats between pr…
7f6b194 
…eemptions (bikas)

(cherry picked from commit a06cd76)

Conflicts:
	CHANGES.txt
	tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
TEZ-2097. TEZ-UI Add dag logs backend support (jeagles)
548e12c 
(cherry picked from commit 6930e4b)
(cherry picked from commit b939cc3)
TEZ-2834. Make Tez preemption resilient to incorrect free resource re…
970bda6 
…ported by YARN (bikas)

(cherry picked from commit 62d9853)

Conflicts:
	CHANGES.txt
  tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
  tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
  tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
	tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
(cherry picked from commit 01ad2a7)
TEZ-2203. Intern strings in tez counters (bikas)
edc2720 
(cherry picked from commit 6e15b2f)

Dropping TestMockDAGAppMaster.java since the test is ignored and mainly
for manual memory testing.

Conflicts:
	CHANGES.txt
	tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java
TEZ-2808. Race condition between preemption and container assignment …
ad9206b 
…(bikas)

(cherry picked from commit 59f8d2a)

Conflicts:
	CHANGES.txt
(cherry picked from commit 91fd5a6)

Conflicts:
	CHANGES.txt
TEZ-2398. Flaky test: TestFaultTolerance (bikas)
d47cdb9 
(cherry picked from commit 406721a)

Conflicts:
	CHANGES.txt
(cherry picked from commit 7dac26e)

Conflicts:
	CHANGES.txt
Fix CHANGES.txt
9aaea3a
@hiteshs
TEZ-2851. Support a way for upstream applications to pass in a caller…
aa48065 
… context to Tez. (hitesh)

(cherry picked from commit 7744443)

Conflicts:
	CHANGES.txt
	tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
	tez-api/src/main/java/org/apache/tez/dag/api/DagTypeConverters.java
	tez-api/src/main/proto/DAGApiRecords.proto
	tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
	tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
	tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/Constants.java
	tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/DagInfo.java
	tez-plugins/tez-history-parser/src/test/java/org/apache/tez/history/TestHistoryParser.java

(cherry picked from commit 1709e46)

Conflicts:
	CHANGES.txt
	tez-api/src/main/java/org/apache/tez/dag/api/DAG.java
	tez-api/src/test/java/org/apache/tez/dag/api/TestDAG.java
	tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
	tez-examples/src/main/java/org/apache/tez/examples/OrderedWordCount.java
	tez-examples/src/main/java/org/apache/tez/examples/TezExampleBase.java
	tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
@zjffdu
TEZ-2758. Remove append API in RecoveryService after TEZ-1909 (zjffdu)
7514b15 
(cherry picked from commit 35c926f)

Conflicts:
	tez-dag/src/main/java/org/apache/tez/dag/history/recovery/RecoveryService.java
@rbalamohan
TEZ-2716. DefaultSorter.isRleNeeded not thread safe (rbalamohan)
3875a04
@sidseth
TEZ-2855. Fix a potential NPE while routing VertexManager events. (ss…
6751a67 
…eth)
@zjffdu
TEZ-2781. Fallback to send only TaskAttemptFailedEvent if taskFailed …
3a8bf0e 
…heartbeat fails (zjffdu)

(cherry picked from commit f9d15c8)

Conflicts:
	CHANGES.txt
	tez-dag/src/main/java/org/apache/tez/dag/app/TaskCommunicatorManager.java

(cherry picked from commit 8d49fd5)

Conflicts:
	CHANGES.txt
	tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
	tez-dag/src/main/java/org/apache/tez/runtime/task/TaskReporter.java
TEZ-2850. Tez MergeManager OOM for small Map Outputs (jeagles)
f36eeb6 
(cherry picked from commit a9cfeb9)
(cherry picked from commit 35bd5ab)
@rbalamohan
TEZ-2907. NPE in IFile.Reader.getLength during final merge operation …
c48bc6f 
…(rbalamohan)

(cherry picked from commit f3cea63)

# Conflicts:
#	CHANGES.txt
@hubot hubot deleted the branch-0.6 branch April 28, 2017 16:22
@hubot hubot restored the branch-0.6 branch April 28, 2017 21:16
t3rmin4t0r added a commit to t3rmin4t0r/tez that referenced this pull request May 5, 2018
@t3rmin4t0r
wip apache#4
91ecd25
@jteagles jteagles closed this Dec 15, 2020
@jteagles
Copy link
Contributor

jteagles commented Dec 15, 2020

branch-0.6 is deprecated

LA-Toth added a commit to LA-Toth/tez that referenced this pull request Feb 8, 2022
@LA-Toth
jdk17: mockito upgrade apache#4
7b01708
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@ljl1988com @hiteshs @jteagles @sidseth @zjffdu @t3rmin4t0r @rbalamohan