You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@yetus.apache.org by "Allen Wittenauer (JIRA)" <ji...@apache.org> on 2017/02/01 22:49:51 UTC

[jira] [Comment Edited] (YETUS-485) Yetus run is failing on branch after rebase/force push

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

Allen Wittenauer edited comment on YETUS-485 at 2/1/17 10:48 PM:
-----------------------------------------------------------------

For reference, here's the git environment section from those console logs, since they'll eventually get wiped from Jenkins:

apache-yetus-0000965
https://builds.apache.org/job/PreCommit-YARN-Build/14775/console:
{code}

HEAD is now at 312b36d HDFS-11378. Verify multiple DataNodes can be decommissioned/maintenance at the same time. (Manoj Govindassamy via mingma)
Previous HEAD position was 312b36d... HDFS-11378. Verify multiple DataNodes can be decommissioned/maintenance at the same time. (Manoj Govindassamy via mingma)
Switched to branch 'trunk'
Your branch is behind 'origin/trunk' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
First, rewinding head to replay your work on top of it...
Fast-forwarded trunk to 312b36d113d83640b92c62fdd91ede74bd04c00f.
Switched to branch 'YARN-2915'
Your branch and 'origin/YARN-2915' have diverged,
and have 20 and 430 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
First, rewinding head to replay your work on top of it...
Applying: YARN-3672. Create Facade for Federation State and Policy Store. Contributed by Subru Krishnan
Using index info to reconstruct a base tree...
M hadoop-project/pom.xml
M hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
M hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
M hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
M hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
Falling back to patching base and 3-way merge...
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
CONFLICT (add/add): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/TestFederationStateStoreFacade.java
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java
CONFLICT (add/add): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreTestUtil.java
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
CONFLICT (add/add): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/federation/utils/FederationStateStoreFacade.java
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
CONFLICT (content): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
CONFLICT (content): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
Auto-merging hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
CONFLICT (content): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
Failed to merge in the changes.
Patch failed at 0001 YARN-3672. Create Facade for Federation State and Policy Store. Contributed by Subru Krishnan
The copy of the patch that failed is found in:
/home/jenkins/jenkins-slave/workspace/PreCommit-YARN-Build/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

ERROR: git pull is failing
{code}

apache-yetus-f70fceb
https://builds.apache.org/job/PreCommit-YARN-Build/14800/console:
{code}
HEAD is now at 258991d HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.
Previous HEAD position was 258991d... HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.
Switched to branch 'trunk'
Your branch is behind 'origin/trunk' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
First, rewinding head to replay your work on top of it...
Fast-forwarded trunk to 258991dc5a3b13640834d1c8803f2eb840f8afea.
Note: checking out '08dc09581230ba595ce48fe7d3bc4eb2b6f98091'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

git checkout -b new_branch_name

HEAD is now at 08dc095... YARN-5872. Add AlwayReject policies for router and amrmproxy. (Carlo Curino via Subru).
You are not currently on a branch. Please specify which
branch you want to rebase against. See git-pull(1) for details.

git pull <remote> <branch>

ERROR: git pull is failing
{code}

was (Author: aw):
For reference, here's the git environment section from those console logs, since they'll eventually get wiped from Jenkins:

https://builds.apache.org/job/PreCommit-YARN-Build/14775/console:
{code}

ERROR: git pull is failing
{code}

https://builds.apache.org/job/PreCommit-YARN-Build/14800/console:
{code}
HEAD is now at 258991d HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.
Previous HEAD position was 258991d... HADOOP-14018. shaded jars of hadoop-client modules are missing hadoop's root LICENSE and NOTICE files. Contributed by Elek, Marton.
Switched to branch 'trunk'
Your branch is behind 'origin/trunk' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
First, rewinding head to replay your work on top of it...
Fast-forwarded trunk to 258991dc5a3b13640834d1c8803f2eb840f8afea.
Note: checking out '08dc09581230ba595ce48fe7d3bc4eb2b6f98091'.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

git checkout -b new_branch_name

git pull <remote> <branch>

ERROR: git pull is failing
{code}

> Yetus run is failing on branch after rebase/force push
> ------------------------------------------------------
>
> Key: YETUS-485
> URL: https://issues.apache.org/jira/browse/YETUS-485
> Project: Yetus
> Issue Type: Bug
> Affects Versions: 0.5.0
> Environment: Apache Jenkins build server
> Reporter: Subru Krishnan
> Priority: Critical
>
> I rebased YARN-2915 with trunk and did a force push following which all Yetus runs fails as the local enlistment in the jenkins slave is outdated: https://builds.apache.org/job/PreCommit-YARN-Build/14775/console. Looked at it with [~chris.douglas] and [~asuresh]'s help and we decided to directly use the commit hash based on https://github.com/apache/yetus/blob/master/precommit/test-patch.sh#L1356-L1368 but even that didn't work out as yetus does a pull after the checkout: https://builds.apache.org/job/PreCommit-YARN-Build/14800/console.

--
This message was sent by Atlassian JIRA
(v6.3.15#6346)