Uploaded image for project: 'Hadoop Common'
  1. Hadoop Common
  2. HADOOP-11944

add option to test-patch to avoid relocating patch process directory

    Details

    • Type: Test
    • Status: Resolved
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 2.8.0, 3.0.0-alpha1
    • Component/s: None
    • Labels:
      None

      Description

      When we have a jenkins setup that places the patch process in a defined location under WORKPLACE, there's no need to have patch process relocate it. Add a flag to leave it as is.

      1. HADOOP-11944.2.patch
        3 kB
        Sean Busbey
      2. HADOOP-11944.1.patch
        3 kB
        Sean Busbey

        Activity

        Hide
        aw Allen Wittenauer added a comment -

        test-patch.sh won't move it if the patchprocess dir is inside basedir. So this should only be necessary if basedir != workspace dir.

        Show
        aw Allen Wittenauer added a comment - test-patch.sh won't move it if the patchprocess dir is inside basedir. So this should only be necessary if basedir != workspace dir.
        Hide
        hadoopqa Hadoop QA added a comment -



        -1 overall



        Vote Subsystem Runtime Comment
        -1 patch 0m 3s The patch command could not apply the patch.



        Subsystem Report/Notes
        Patch URL http://issues.apache.org/jira/secure/attachment/12731630/HADOOP-11944.1.patch
        Optional Tests shellcheck
        git revision trunk / cbea5d2
        Console output https://builds.apache.org/job/PreCommit-HADOOP-Build/6590/console

        This message was automatically generated.

        Show
        hadoopqa Hadoop QA added a comment - -1 overall Vote Subsystem Runtime Comment -1 patch 0m 3s The patch command could not apply the patch. Subsystem Report/Notes Patch URL http://issues.apache.org/jira/secure/attachment/12731630/HADOOP-11944.1.patch Optional Tests shellcheck git revision trunk / cbea5d2 Console output https://builds.apache.org/job/PreCommit-HADOOP-Build/6590/console This message was automatically generated.
        Hide
        busbey Sean Busbey added a comment -

        Right, when using test-patch to handle another project, I've been going with a workspace that looks like this:

        {pre}
        WORKSPACE
        |
        |--- testframework (hadoop git checkout)
        |
        |--- component (project-under-test git checkout)
        |
        --- patchprocess (scratch dir cleaned by jenkins){pre}

        Then I invoke test-patch within testframework while giving a BASEDIR that's the component to test. This lets Jenkins handle the two git repos cleanly and archive things out of patchprocess.

        Show
        busbey Sean Busbey added a comment - Right, when using test-patch to handle another project, I've been going with a workspace that looks like this: {pre} WORKSPACE | |--- testframework (hadoop git checkout) | |--- component (project-under-test git checkout) | --- patchprocess (scratch dir cleaned by jenkins){pre} Then I invoke test-patch within testframework while giving a BASEDIR that's the component to test. This lets Jenkins handle the two git repos cleanly and archive things out of patchprocess.
        Hide
        busbey Sean Busbey added a comment -

        should I move the cli check after the "relative_patchdir" check?

        Show
        busbey Sean Busbey added a comment - should I move the cli check after the "relative_patchdir" check?
        Hide
        aw Allen Wittenauer added a comment -

        Gotcha. Very clever. Re-base and let's get this in.

        Show
        aw Allen Wittenauer added a comment - Gotcha. Very clever. Re-base and let's get this in.
        Hide
        aw Allen Wittenauer added a comment -

        should I move the cli check after the "relative_patchdir" check?

        It should probably be re-written as a single, multi-check if statement at this point.

        Show
        aw Allen Wittenauer added a comment - should I move the cli check after the "relative_patchdir" check? It should probably be re-written as a single, multi-check if statement at this point.
        Hide
        busbey Sean Busbey added a comment -

        actually I just re-read this comment:

                # if PATCH_DIR is already inside BASEDIR, then
                # there is no need to move it since we assume that
                # Jenkins or whatever already knows where it is at
                # since it told us to put it there!
        

        Maybe I've been thinking about this wrong. Should this check be looking to see if the user passed in a patch dir? We already know if they did because USER_PATCH_DIR will be set. In that case, presumably the same condition will hold.

        Show
        busbey Sean Busbey added a comment - actually I just re-read this comment: # if PATCH_DIR is already inside BASEDIR, then # there is no need to move it since we assume that # Jenkins or whatever already knows where it is at # since it told us to put it there! Maybe I've been thinking about this wrong. Should this check be looking to see if the user passed in a patch dir? We already know if they did because USER_PATCH_DIR will be set. In that case, presumably the same condition will hold.
        Hide
        aw Allen Wittenauer added a comment -

        It's probably easier to flip the condition. Only move it if we are told to move it. yes, I realize this will break Hadoop's current precommit stuff. We should be able to add --mv-patch-dir to the Jenkins config before testing the patch.

        Show
        aw Allen Wittenauer added a comment - It's probably easier to flip the condition. Only move it if we are told to move it. yes, I realize this will break Hadoop's current precommit stuff. We should be able to add --mv-patch-dir to the Jenkins config before testing the patch.
        Hide
        busbey Sean Busbey added a comment -

        canceling patch for rework into positive flag for moving.

        Show
        busbey Sean Busbey added a comment - canceling patch for rework into positive flag for moving.
        Hide
        busbey Sean Busbey added a comment -

        the jenkins jobs have all had --mv-patch-dir added.

        -02

        • flip the opt in/out. no moving the dir by default now
        • change nested ifs to a compound check
        Show
        busbey Sean Busbey added a comment - the jenkins jobs have all had --mv-patch-dir added. -02 flip the opt in/out. no moving the dir by default now change nested ifs to a compound check
        Hide
        hadoopqa Hadoop QA added a comment -

        A patch to test-patch or smart-apply-patch has been detected.
        Re-executing against the patched versions to perform further tests.
        The console is at https://builds.apache.org/job/PreCommit-HADOOP-Build/6710/console in case of problems.

        Show
        hadoopqa Hadoop QA added a comment - A patch to test-patch or smart-apply-patch has been detected. Re-executing against the patched versions to perform further tests. The console is at https://builds.apache.org/job/PreCommit-HADOOP-Build/6710/console in case of problems.
        Hide
        hadoopqa Hadoop QA added a comment -



        +1 overall



        Vote Subsystem Runtime Comment
        0 reexec 0m 0s dev-support patch detected.
        0 pre-patch 0m 0s Pre-patch trunk compilation is healthy.
        0 @author 0m 0s Skipping @author checks as test-patch has been patched.
        +1 release audit 0m 19s The applied patch does not increase the total number of release audit warnings.
        +1 shellcheck 0m 8s There were no new shellcheck (v0.3.3) issues.
        +1 whitespace 0m 0s The patch has no lines that end in whitespace.
            0m 30s  



        Subsystem Report/Notes
        Patch URL http://issues.apache.org/jira/secure/attachment/12733308/HADOOP-11944.2.patch
        Optional Tests shellcheck
        git revision trunk / b0ad644
        Java 1.7.0_55
        uname Linux asf909.gq1.ygridcore.net 3.13.0-36-lowlatency #63-Ubuntu SMP PREEMPT Wed Sep 3 21:56:12 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
        Console output https://builds.apache.org/job/PreCommit-HADOOP-Build/6710/console

        This message was automatically generated.

        Show
        hadoopqa Hadoop QA added a comment - +1 overall Vote Subsystem Runtime Comment 0 reexec 0m 0s dev-support patch detected. 0 pre-patch 0m 0s Pre-patch trunk compilation is healthy. 0 @author 0m 0s Skipping @author checks as test-patch has been patched. +1 release audit 0m 19s The applied patch does not increase the total number of release audit warnings. +1 shellcheck 0m 8s There were no new shellcheck (v0.3.3) issues. +1 whitespace 0m 0s The patch has no lines that end in whitespace.     0m 30s   Subsystem Report/Notes Patch URL http://issues.apache.org/jira/secure/attachment/12733308/HADOOP-11944.2.patch Optional Tests shellcheck git revision trunk / b0ad644 Java 1.7.0_55 uname Linux asf909.gq1.ygridcore.net 3.13.0-36-lowlatency #63-Ubuntu SMP PREEMPT Wed Sep 3 21:56:12 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux Console output https://builds.apache.org/job/PreCommit-HADOOP-Build/6710/console This message was automatically generated.
        Hide
        aw Allen Wittenauer added a comment -

        +1 committed

        thanks!

        Show
        aw Allen Wittenauer added a comment - +1 committed thanks!
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Hadoop-trunk-Commit #7853 (See https://builds.apache.org/job/Hadoop-trunk-Commit/7853/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • hadoop-common-project/hadoop-common/CHANGES.txt
        • dev-support/test-patch.sh
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Hadoop-trunk-Commit #7853 (See https://builds.apache.org/job/Hadoop-trunk-Commit/7853/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) hadoop-common-project/hadoop-common/CHANGES.txt dev-support/test-patch.sh
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Hadoop-Yarn-trunk #932 (See https://builds.apache.org/job/Hadoop-Yarn-trunk/932/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • hadoop-common-project/hadoop-common/CHANGES.txt
        • dev-support/test-patch.sh
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Hadoop-Yarn-trunk #932 (See https://builds.apache.org/job/Hadoop-Yarn-trunk/932/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) hadoop-common-project/hadoop-common/CHANGES.txt dev-support/test-patch.sh
        Hide
        hudson Hudson added a comment -

        SUCCESS: Integrated in Hadoop-Yarn-trunk-Java8 #201 (See https://builds.apache.org/job/Hadoop-Yarn-trunk-Java8/201/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • dev-support/test-patch.sh
        • hadoop-common-project/hadoop-common/CHANGES.txt
        Show
        hudson Hudson added a comment - SUCCESS: Integrated in Hadoop-Yarn-trunk-Java8 #201 (See https://builds.apache.org/job/Hadoop-Yarn-trunk-Java8/201/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) dev-support/test-patch.sh hadoop-common-project/hadoop-common/CHANGES.txt
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Hadoop-Hdfs-trunk #2130 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk/2130/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • dev-support/test-patch.sh
        • hadoop-common-project/hadoop-common/CHANGES.txt
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Hadoop-Hdfs-trunk #2130 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk/2130/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) dev-support/test-patch.sh hadoop-common-project/hadoop-common/CHANGES.txt
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Hadoop-Hdfs-trunk-Java8 #190 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk-Java8/190/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • hadoop-common-project/hadoop-common/CHANGES.txt
        • dev-support/test-patch.sh
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Hadoop-Hdfs-trunk-Java8 #190 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk-Java8/190/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) hadoop-common-project/hadoop-common/CHANGES.txt dev-support/test-patch.sh
        Hide
        hudson Hudson added a comment -

        SUCCESS: Integrated in Hadoop-Mapreduce-trunk-Java8 #200 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk-Java8/200/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • hadoop-common-project/hadoop-common/CHANGES.txt
        • dev-support/test-patch.sh
        Show
        hudson Hudson added a comment - SUCCESS: Integrated in Hadoop-Mapreduce-trunk-Java8 #200 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk-Java8/200/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) hadoop-common-project/hadoop-common/CHANGES.txt dev-support/test-patch.sh
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Hadoop-Mapreduce-trunk #2148 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk/2148/)
        HADOOP-11944. add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35)

        • dev-support/test-patch.sh
        • hadoop-common-project/hadoop-common/CHANGES.txt
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Hadoop-Mapreduce-trunk #2148 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk/2148/ ) HADOOP-11944 . add option to test-patch to avoid relocating patch process directory (Sean Busbey via aw) (aw: rev bcc17866ddb616e8c70e5aa044becd7a7d1bee35) dev-support/test-patch.sh hadoop-common-project/hadoop-common/CHANGES.txt

          People

          • Assignee:
            busbey Sean Busbey
            Reporter:
            busbey Sean Busbey
          • Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development