[ovirt-devel] Additional patches in vdsm - post mortem

[Dan Kenigsberg]

On Mon, Oct 9, 2017 at 11:12 AM, Piotr Kliczewski
<piotr.kliczewski at gmail.com> wrote:
> All,
>
> Recently you could notice few patches being merged and later reverted.
> I would like to say what happened. Sometime ago I pushed a tag to
> vdsm-jsonrpc-java and later reused that command from my history to
> push 6 patches [1][2][3][4][5][6] to vdsm for a review. I did not
> notice that I pushed for `heads/master` instead of `for/master` this
> caused to bypass gerrit and the patches were merged. When I noticed
> what happened I pushed [7] to revert it. I hope no-one was affected.
>
> Thanks,
> Piotr

Thanks for your report, Piotr.

I believe that [7] should have been sent properly, via gerrit, and not
by direct git merge. Unless we close git access, errors would happen.
But when you realize you've made a mistake, better fix via gerrit.

In particular, I think [7] has mistakes; it is not clear to me how you
have produced it.

fc1174c91~ is the last commit before the mess occurred, right? da18b865 is [7].
But
$ git diff --name-only fc1174c91~..da18b865|cat
.cache/v/cache/lastfailed
init/systemd/systemd-vdsmd

is not empty. It introduces two files with no good reason.



>
> [1] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=fc1174c91f68ba389df5ef7269d54a942da93f8f
> [2] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=4d2f50014a96f9f98d811d0818743dc36ab82732
> [3] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=8937d12ac55cc9fba103306d656fea44c1ae0a2b
> [4] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=27912da968d24b26b577a6a944810b331e51f6ff
> [5] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=b10d699e884fd6e73ff686e23433d14fbdc2df6e
> [6] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=d668f11a8390397de96c91ac2ab8860186d2cfa2
> [7] https://gerrit.ovirt.org/gitweb?p=vdsm.git;a=commit;h=da18b8651a0c32792d507f99e19f9d4aed8be060
> _______________________________________________
> Devel mailing list
> Devel at ovirt.org
> http://lists.ovirt.org/mailman/listinfo/devel
>
>