----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/11113/#review20912 -----------------------------------------------------------
I can't actually update this. When I try to use post-review I get the following error: brenden@airbob ~/dev/mesos $ post-review --review-request-id=11113 --repository-url=https://git-wip-us.apache.org/repos/asf/incubator-mesos.git --tracking-branch=master --revision-range=de916f4cb333d111133d1a093f8126a38c9cf0ef:4d0fd9de023d4880c20eaa51cdd8e5752eecd38e --target-groups=mesos --output-diff --debug >>> RBTools 0.5 >>> Python 2.7.5 (default, May 20 2013, 11:51:12) [GCC 4.7.3] >>> Running on Linux-3.8.5-x86_64-with-debian-jessie-sid >>> Home = /home/brenden >>> Current Directory = /home/brenden/dev/mesos >>> Checking the repository type. Errors shown below are mostly harmless. DEBUG:root:Checking for a Bazaar repository... DEBUG:root:Checking for a CVS repository... DEBUG:root:Checking for a ClearCase repository... DEBUG:root:Checking for a Git repository... DEBUG:root:Running: git rev-parse --git-dir DEBUG:root:Running: git config core.bare DEBUG:root:Running: git rev-parse --show-toplevel DEBUG:root:Running: git symbolic-ref -q HEAD DEBUG:root:Running: git config --get branch.testing.merge DEBUG:root:Running: git config --get branch.testing.remote DEBUG:root:Running: git config --get remote.master.url DEBUG:root:Command exited with rc 1: ['git', 'config', '--get', 'remote.master.url'] --- DEBUG:root:repository info: Path: https://git-wip-us.apache.org/repos/asf/incubator-mesos.git, Base path: , Supports changesets: False >>> Finished checking the repository type. DEBUG:root:Running: git config --get reviewboard.url >>> HTTP GETting api/info/ DEBUG:root:Running: git merge-base master refs/heads/testing DEBUG:root:Running: git branch -r --contains de916f4cb333d111133d1a093f8126a38c9cf0ef DEBUG:root:Running: git diff --no-color --full-index --no-ext-diff --ignore-submodules --no-renames de916f4cb333d111133d1a093f8126a38c9cf0ef..4d0fd9de023d4880c20eaa51cdd8e5752eecd38e diff --git a/hadoop/HadoopPipes.cc.patch b/hadoop/HadoopPipes.cc.patch new file mode 100644 index 0000000000000000000000000000000000000000..aa5df7c5e9e0a84a4044e1edafc7ae2d93ae2fc9 --- /dev/null +++ b/hadoop/HadoopPipes.cc.patch @@ -0,0 +1,10 @@ +--- hadoop-2.0.0-mr1-cdh4.2.0/src/c++/pipes/impl/HadoopPipes.cc.old 2013-04-16 20:18:22.681061322 +0000 ++++ hadoop-2.0.0-mr1-cdh4.2.0/src/c++/pipes/impl/HadoopPipes.cc 2013-04-16 20:18:44.005060961 +0000 +@@ -34,6 +34,7 @@ + #include <pthread.h> + #include <iostream> + #include <fstream> ++#include <unistd.h> + + #include <openssl/hmac.h> + #include <openssl/buffer.h> diff --git a/hadoop/Makefile.am b/hadoop/Makefile.am index ceac085971bd04fe0a6aa9b7edaedc83b08b9abf..f32f2688d4403549629a332572af867feba03bd9 100644 --- a/hadoop/Makefile.am +++ b/hadoop/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = TUTORIAL.sh hadoop-gridmix.patch \ hadoop-2.0.0-mr1-cdh4.2.0_mesos.patch \ hadoop-7698-1.patch \ hadoop-0.20.205.0_hadoop-env.sh.patch hadoop-0.20.205.0_mesos.patch \ + HadoopPipes.cc.patch \ mapred-site.xml.patch mesos-executor mesos/build.xml \ mesos/ivy/libraries.properties mesos/ivy.xml \ mesos/src/java/org/apache/hadoop/mapred/MesosExecutor.java \ @@ -67,6 +68,7 @@ hadoop-2.0.0-mr1-cdh4.1.2: cp -p $(srcdir)/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch .; \ cp -p $(srcdir)/hadoop-2.0.0-mr1-cdh4.1.2_mesos.patch .; \ cp -p $(srcdir)/mapred-site.xml.patch .; \ + cp -p $(srcdir)/HadoopPipes.cc.patch .; \ cp -rp $(srcdir)/mesos .; \ cp -p $(srcdir)/mesos-executor .; \ fi @@ -80,6 +82,7 @@ hadoop-2.0.0-mr1-cdh4.2.0: cp -p $(srcdir)/hadoop-2.0.0-mr1-cdh4.2.0_hadoop-env.sh.patch .; \ cp -p $(srcdir)/hadoop-2.0.0-mr1-cdh4.2.0_mesos.patch .; \ cp -p $(srcdir)/mapred-site.xml.patch .; \ + cp -p $(srcdir)/HadoopPipes.cc.patch .; \ cp -rp $(srcdir)/mesos .; \ cp -p $(srcdir)/mesos-executor .; \ fi diff --git a/hadoop/TUTORIAL.sh b/hadoop/TUTORIAL.sh index ccb9a766f6d198803646d51a2f78644d994c8b38..dc96c75329280243739bb9848f748dfaa0969caf 100755 --- a/hadoop/TUTORIAL.sh +++ b/hadoop/TUTORIAL.sh @@ -94,6 +94,10 @@ if test ${distribution} = "0.20.205.0"; then resources="${resources} hadoop-7698-1.patch" fi +if test ${distribution} = "2.0.0-mr1-cdh4.1.2" -o ${distribution} = "2.0.0-mr1-cdh4.2.0"; then + resources="${resources} HadoopPipes.cc.patch" +fi + for resource in `echo ${resources}`; do if test ! -e ${resource}; then cat <<__EOF__ @@ -111,7 +115,7 @@ __EOF__ fi done -# Make sure we have all the programs we need. +# Make sure we have all the build tools we need. programs="mvn \ ant" @@ -120,7 +124,7 @@ for program in `echo ${programs}`; do if test "$?" != 0; then cat <<__EOF__ -${RED}We seem to be missing ${program} from the path. Please install +${RED}We seem to be missing ${program} from PATH. Please install ${program} and re-run this tutorial. If you still have troubles, please report this to: @@ -515,6 +519,41 @@ if test ${REPLY} == "Y" -o ${REPLY} == "y"; then execute "patch -p1 <../${hadoop}_hadoop-env.sh.patch" fi +if test ${distribution} = "2.0.0-mr1-cdh4.1.2" -o ${distribution} = "2.0.0-mr1-cdh4.2.0"; then + # Apply HadoopPipes.cc patch. + cat <<__EOF__ + + This version of Hadoop needs to be patched to build on GCC 4.7 and newer compilers. + +__EOF__ + + read -e -p "${BRIGHT}Hit enter to continue.${NORMAL} " + echo + + patch --dry-run --silent --force -p1 \ + <../HadoopPipes.cc.patch 1>/dev/null 2>&1 + + if test ${?} == "1"; then + cat <<__EOF__ + + ${RED}It looks like conf/hadoop-env.sh has been modified. You'll need + to copy that to something else and restore the file to it's original + contents before we'll be able to apply this patch.${NORMAL} + +__EOF__ + DEFAULT="N" + else + DEFAULT="Y" + fi + + read -e -p "${BRIGHT}Patch src/c++/pipes/impl/HadoopPipes.cc?${NORMAL} [${DEFAULT}] " + echo + test -z ${REPLY} && REPLY=${DEFAULT} + if test ${REPLY} == "Y" -o ${REPLY} == "y"; then + execute "patch -p1 <../HadoopPipes.cc.patch" + fi +fi + # Build Hadoop and Mesos executor package that Mesos slaves can download # and execute. # TODO(vinod): Create a new ant target in build.xml that builds the executor. brenden@airbob ~/dev/mesos $ - Brenden Matthews On May 22, 2013, 8:33 p.m., Brenden Matthews wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/11113/ > ----------------------------------------------------------- > > (Updated May 22, 2013, 8:33 p.m.) > > > Review request for mesos. > > > Description > ------- > > From 81abe928b76176e8fe7af41ad037783f4eda7090 Mon Sep 17 00:00:00 2001 > From: Brenden Matthews <[email protected]> > Date: Tue, 16 Apr 2013 13:22:10 -0700 > Subject: [PATCH 06/24] Build fix for HadoopPipes.cc with GCC 4.7. > > Review: https://reviews.apache.org/r/11113 > --- > hadoop/HadoopPipes.cc.patch | 10 ++++++++++ > hadoop/Makefile.am | 3 +++ > hadoop/TUTORIAL.sh | 43 > +++++++++++++++++++++++++++++++++++++++++-- > 3 files changed, 54 insertions(+), 2 deletions(-) > create mode 100644 hadoop/HadoopPipes.cc.patch > > > Diffs > ----- > > hadoop/HadoopPipes.cc.patch PRE-CREATION > hadoop/Makefile.am ceac085971bd04fe0a6aa9b7edaedc83b08b9abf > hadoop/TUTORIAL.sh d81c55562d217e8784745d4a8cedf78ada9f5453 > > Diff: https://reviews.apache.org/r/11113/diff/ > > > Testing > ------- > > Used in production at airbnb. > > > Thanks, > > Brenden Matthews > >
