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

Posted to dev@zookeeper.apache.org by Mohammad arshad <mo...@huawei.com> on 2016/08/16 08:29:38 UTC

ZOOKEEPER pre-commit fails if patch contains binary file

Hello everyone

In ZooKeeper pre-commit patch apply has failed for the patch ZOOKEEPER-1260-01.patch. This patch applies on trunk locally
ZOOKEEPER-1260-01.patch contains a binary file. This patch is generated with "git diff --no-prefix --binary HEAD > ZOOKEEPER-1260-01.patch" command
I think the binary file, in the patch, is the reason for failure in CI.
any idea on how to give patch in zookeeper which has binary file?

Thanks
-Arshad

Re: ZOOKEEPER pre-commit fails if patch contains binary file

Posted by Chris Nauroth <cn...@hortonworks.com>.

The last time we discussed this, consensus in the community was that our most effective roadmap for build toolchain improvements would be:

1) Migrate to Maven.  This is tracked in ZOOKEEPER-1078, and I know you’re interested in pushing that one ahead too.
2) Migrate to Yetus after the switch to Maven.

I don’t believe there is anything we are waiting on from the Yetus project in terms of features or stability.  It’s already used successfully in Hadoop and other projects.  Yetus can work with an Ant build, but our integration with Yetus would look different for an Ant build vs. a Maven build.  If Maven migration is inevitable, then I’d rather not spend effort on the Ant build integration only to throw it away later.

--Chris Nauroth

On 8/16/16, 11:29 AM, "Arshad Mohammad" <ar...@gmail.com> wrote:

    Thanks Chris, for clarification and suggestion. I will submit the patch
    without binary file.

    Seems Yetus is very important and necessary for ZooKeeper and I have heard
    many times in community discussion that a particular problem can be solved
    with Yetus
    Is there any plan for migration like in 3.5.3 or in other release? is there
    anything we are waiting for, like more stable Yetus release etc.

    -Arshad

    On Tue, Aug 16, 2016 at 11:34 PM, Chris Nauroth <cn...@hortonworks.com>
    wrote:

    > Unfortunately, I don’t think it’s possible for the current ZooKeeper
    > test-patch.sh to work with a binary file.  If we eventually migrate to
    > Apache Yetus, then its version of pre-commit has the capability to run “git
    > apply”, which can handle binary diffs generated by “git diff”.
    >
    > For ZOOKEEPER-1260, I think you’ll need to work through pre-commit by
    > attaching an alternative version of the patch that omits the binary file.
    > (It’s a JPEG for the docs, so omitting the file won’t harm test results.)
    >
    > --Chris Nauroth
    >
    > On 8/16/16, 1:29 AM, "Mohammad arshad" <mo...@huawei.com> wrote:
    >
    >     Hello everyone
    >
    >     In ZooKeeper pre-commit patch apply has failed for the patch
    > ZOOKEEPER-1260-01.patch. This patch applies on trunk locally
    >     ZOOKEEPER-1260-01.patch contains a binary file. This patch is
    > generated with "git diff --no-prefix --binary HEAD >
    > ZOOKEEPER-1260-01.patch" command
    >     I think the binary file, in the patch, is the reason for failure in CI.
    >     any idea on how to give patch in zookeeper which has binary file?
    >
    >     Thanks
    >     -Arshad
    >
    >
    >

Re: ZOOKEEPER pre-commit fails if patch contains binary file

Posted by Arshad Mohammad <ar...@gmail.com>.

Thanks Chris, for clarification and suggestion. I will submit the patch
without binary file.

Seems Yetus is very important and necessary for ZooKeeper and I have heard
many times in community discussion that a particular problem can be solved
with Yetus
Is there any plan for migration like in 3.5.3 or in other release? is there
anything we are waiting for, like more stable Yetus release etc.

-Arshad


On Tue, Aug 16, 2016 at 11:34 PM, Chris Nauroth <cn...@hortonworks.com>
wrote:

> Unfortunately, I don’t think it’s possible for the current ZooKeeper
> test-patch.sh to work with a binary file.  If we eventually migrate to
> Apache Yetus, then its version of pre-commit has the capability to run “git
> apply”, which can handle binary diffs generated by “git diff”.
>
> For ZOOKEEPER-1260, I think you’ll need to work through pre-commit by
> attaching an alternative version of the patch that omits the binary file.
> (It’s a JPEG for the docs, so omitting the file won’t harm test results.)
>
> --Chris Nauroth
>
> On 8/16/16, 1:29 AM, "Mohammad arshad" <mo...@huawei.com> wrote:
>
>     Hello everyone
>
>     In ZooKeeper pre-commit patch apply has failed for the patch
> ZOOKEEPER-1260-01.patch. This patch applies on trunk locally
>     ZOOKEEPER-1260-01.patch contains a binary file. This patch is
> generated with "git diff --no-prefix --binary HEAD >
> ZOOKEEPER-1260-01.patch" command
>     I think the binary file, in the patch, is the reason for failure in CI.
>     any idea on how to give patch in zookeeper which has binary file?
>
>     Thanks
>     -Arshad
>
>
>

Re: ZOOKEEPER pre-commit fails if patch contains binary file

Posted by Chris Nauroth <cn...@hortonworks.com>.

Unfortunately, I don’t think it’s possible for the current ZooKeeper test-patch.sh to work with a binary file.  If we eventually migrate to Apache Yetus, then its version of pre-commit has the capability to run “git apply”, which can handle binary diffs generated by “git diff”.

For ZOOKEEPER-1260, I think you’ll need to work through pre-commit by attaching an alternative version of the patch that omits the binary file.  (It’s a JPEG for the docs, so omitting the file won’t harm test results.)

--Chris Nauroth

On 8/16/16, 1:29 AM, "Mohammad arshad" <mo...@huawei.com> wrote:

    Hello everyone
    
    In ZooKeeper pre-commit patch apply has failed for the patch ZOOKEEPER-1260-01.patch. This patch applies on trunk locally
    ZOOKEEPER-1260-01.patch contains a binary file. This patch is generated with "git diff --no-prefix --binary HEAD > ZOOKEEPER-1260-01.patch" command
    I think the binary file, in the patch, is the reason for failure in CI.
    any idea on how to give patch in zookeeper which has binary file?
    
    Thanks
    -Arshad