[Gluster-devel] patches missing in git even after gerrit says they are merged

Niels de Vos ndevos at redhat.com
Fri Aug 22 15:34:32 UTC 2014


On Fri, Aug 22, 2014 at 11:04:32AM +0200, Niels de Vos wrote:
> On Fri, Aug 22, 2014 at 01:05:13PM +0530, Pranith Kumar Karampuri wrote:
> > 
> > On 08/22/2014 12:58 PM, Anand Avati wrote:
> > >Whole of /review seems to be owned by gerrit already. Can someone
> > >re-post/remerge the patches? That would be the simplest. Are the
> > >patches available in the github mirror?
> > I will resubmit. I don't see it on github either.
> 
> The patches are still available in the review request under the 
> "refs/changes/CD/ABCD/P" ABCD is the 4-digit change#, and P is the 
> number of the patch.
> 
> You can fetch the change, merge it and push to the repo again. I'm just 
> not sure if the commit-id will change that way...
> 
> I might be able to try/test that later today.

Ah, it seems that there have been some new merged patches already. This 
makes the git tree/hashes different from what they were when Gerrit went 
funky. I don't think there is anything else we can do, other than repost 
and submit the patches :-/ It probably would be good to note the mishap 
in the related bug for the patch, and in the now obsolete (but marked 
merged) change request.

Niels

> 
> HTH,
> Niels
> 
> 
> > 
> > Pranith
> > >
> > >
> > >
> > >On Fri, Aug 22, 2014 at 12:01 AM, Justin Clift <justin at gluster.org
> > ><mailto:justin at gluster.org>> wrote:
> > >
> > >    We *might* need to chown all of /review/ directory down first too, as
> > >    that still has somewhat mixed permissions.  I'm not personally sure
> > >    and don't really want to touch it until Vijay/Avati have had a go.
> > >
> > >    As a data point though, there's a tarball of the /review/ directory
> > >    in /opt/justin_tmp/ that was taking just after the initial chmod
> > >    yesterday.  In case Vijay/Avati need to revert back to that.  No
> > >    idea what state these missing merged patches were in at that time
> > >    though.
> > >
> > >    /me leaves it to Vijay/Avati to figure out. :)
> > >
> > >    + Justin
> > >
> > >
> > >    On 22/08/2014, at 7:30 AM, Humble Devassy Chirammal wrote:
> > >    > I believe Vijay/Avati can do that.
> > >    >
> > >    > On Fri, Aug 22, 2014 at 11:57 AM, Krishnan Parthasarathi
> > >    <kparthas at redhat.com <mailto:kparthas at redhat.com>> wrote:
> > >    > Humble,
> > >    >
> > >    > Who will be mergeing these patches into the repo?
> > >    >
> > >    > ~KP
> > >    >
> > >    > ----- Original Message -----
> > >    > > Below patches were in status of 'submitted , merge pending'
> > >    when gerrit went
> > >    > > wrong yesterday.
> > >    > >
> > >    > > http://review.gluster.org/#/c/8459/
> > >    > > http://review.gluster.org/#/c/8466/
> > >    > > http://review.gluster.org/#/c/8507/
> > >    > >
> > >    > > Possibly we have to merge those in repo again.
> > >    > >
> > >    > > --Humble
> > >    > >
> > >    > >
> > >    > > On Fri, Aug 22, 2014 at 10:12 AM, Sachin Pandit <
> > >    spandit at redhat.com <mailto:spandit at redhat.com> > wrote:
> > >    > >
> > >    > >
> > >    > > Hi,
> > >    > >
> > >    > > In gerrit, the status of http://review.gluster.org/#/c/8507/
> > >    is merged.
> > >    > > But I dont see the changes in git as Pranith mentioned.
> > >    > >
> > >    > > ~ Sachin.
> > >    > >
> > >    > > ----- Original Message -----
> > >    > > From: "Pranith Kumar Karampuri" < pkarampu at redhat.com
> > >    <mailto:pkarampu at redhat.com> >
> > >    > > To: "Vijay Bellur" < vbellur at redhat.com
> > >    <mailto:vbellur at redhat.com> >
> > >    > > Cc: "Gluster Devel" < gluster-devel at gluster.org
> > >    <mailto:gluster-devel at gluster.org> >
> > >    > > Sent: Thursday, August 21, 2014 10:05:42 PM
> > >    > > Subject: [Gluster-devel] patches missing in git even after
> > >    gerrit says they
> > >    > > are merged
> > >    > >
> > >    > > hi Vijay,
> > >    > > http://review.gluster.org/#/c/8466/ is one such candidate. CCed
> > >    > > gluster-devel so that others can also verify that their
> > >    patches are in.
> > >    > >
> > >    > > Pranith
> > >    > > _______________________________________________
> > >    > > Gluster-devel mailing list
> > >    > > Gluster-devel at gluster.org <mailto:Gluster-devel at gluster.org>
> > >    > > http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > >    > > _______________________________________________
> > >    > > Gluster-devel mailing list
> > >    > > Gluster-devel at gluster.org <mailto:Gluster-devel at gluster.org>
> > >    > > http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > >    > >
> > >    > >
> > >    > > _______________________________________________
> > >    > > Gluster-devel mailing list
> > >    > > Gluster-devel at gluster.org <mailto:Gluster-devel at gluster.org>
> > >    > > http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > >    > >
> > >    >
> > >    > _______________________________________________
> > >    > Gluster-devel mailing list
> > >    > Gluster-devel at gluster.org <mailto:Gluster-devel at gluster.org>
> > >    > http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > >
> > >    --
> > >    GlusterFS - http://www.gluster.org
> > >
> > >    An open source, distributed file system scaling to several
> > >    petabytes, and handling thousands of clients.
> > >
> > >    My personal twitter: twitter.com/realjustinclift
> > >    <http://twitter.com/realjustinclift>
> > >
> > >    _______________________________________________
> > >    Gluster-devel mailing list
> > >    Gluster-devel at gluster.org <mailto:Gluster-devel at gluster.org>
> > >    http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > >
> > >
> > >
> > >
> > >_______________________________________________
> > >Gluster-devel mailing list
> > >Gluster-devel at gluster.org
> > >http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> > 
> 
> > _______________________________________________
> > Gluster-devel mailing list
> > Gluster-devel at gluster.org
> > http://supercolony.gluster.org/mailman/listinfo/gluster-devel
> 
> _______________________________________________
> Gluster-devel mailing list
> Gluster-devel at gluster.org
> http://supercolony.gluster.org/mailman/listinfo/gluster-devel


More information about the Gluster-devel mailing list