mesos-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Benjamin Bannier <benjamin.bann...@mesosphere.io>
Subject Re: Review Request 68370: Updated Zookeeper to fix `-Werror-format-overflow` error.
Date Thu, 16 Aug 2018 07:21:26 GMT

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/68370/#review207392
-----------------------------------------------------------


Fix it, then Ship it!





3rdparty/zookeeper-3.4.8.patch
Lines 1748-1760 (patched)
<https://reviews.apache.org/r/68370/#comment290785>

    We already backport a large changeset to our zookeeper "fork" and should we upgrade the
bundled version, finding out what has landed, was never upstream, and what still needs to
be applied is a lot of work.
    
    Would you mind adding more metadata to this patch? You could e.g., check out zookeeper's
3.4.8 in a git repo, patch the file and commit, and append the git-formated patch here. We
would then have an atomic set of changes plus metadata (atomicity is trivial here since only
a single file got changed).
    
        From aa3dbe7d8dde4f31cf6038f62dfbaf73afabce69 Mon Sep 17 00:00:00 2001
        From: Kapil Arya <kapil@mesosphere.io>
        Date: Tue, 3 Jul 2018 15:44:54 -0500
        Subject: [PATCH] Backported a format error fix.
        
        This patch backports https://github.com/apache/zookeeper/pull/559.
        ---
         src/c/src/zookeeper.c | 2 +-
         1 file changed, 1 insertion(+), 1 deletion(-)
        
        diff --git a/src/c/src/zookeeper.c b/src/c/src/zookeeper.c
        index 1ba90af..a4c28e3 100644
        --- a/src/c/src/zookeeper.c
        +++ b/src/c/src/zookeeper.c
        @@ -3440,7 +3440,7 @@ int zoo_add_auth(zhandle_t *zh,const char* scheme,const char*
cert,
         static const char* format_endpoint_info(const struct sockaddr_storage* ep)
         {
             static char buf[128];
        -    char addrstr[128];
        +    char addrstr[INET6_ADDRSTRLEN];
             void *inaddr;
         #ifdef WIN32
             char * addrstring;
        --
        2.9.5
    
    There might be other ways to add metadata to a patch.
    
    As what you propose is in line with what we do elsewhere, feel free to drop this issue
if you strongly disagree. I believe it would be a worthwhile improvement of our patch process
though.


- Benjamin Bannier


On Aug. 16, 2018, 1:34 a.m., Kapil Arya wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/68370/
> -----------------------------------------------------------
> 
> (Updated Aug. 16, 2018, 1:34 a.m.)
> 
> 
> Review request for mesos, Benjamin Bannier and Vinod Kone.
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> The patch is motivated from:
>   https://github.com/apache/zookeeper/pull/559/
> 
> 
> Diffs
> -----
> 
>   3rdparty/zookeeper-3.4.8.patch edfc3b5cf20568ded024137e3d4f7ab2fe221c2d 
> 
> 
> Diff: https://reviews.apache.org/r/68370/diff/1/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Kapil Arya
> 
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message