[Geoserver-devel] Last day commits all gone!

GeoServer GeoServer Developer
1

Hi,
not sure what happened but it seems all commits done in the last 24 hours or so
are gone from master. This happened in the last two hours.
We ended up missing Alessio’s improvements for WPS, Daniele’s fixes for
the changes in structured coverage grid reader, and my wcs-eo graduation pull request
(listing the ones I remember).

The last commit seems a merge made by David.

The big question is… how do we get the commits back?

Cheers
Andrea

–

== Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information ==

Ing. Andrea Aime

@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

2

On Wed, Jan 15, 2014 at 2:05 PM, Andrea Aime
<andrea.aime@anonymised.com>wrote:

Hi,
not sure what happened but it seems all commits done in the last 24 hours
or so
are gone from master. This happened in the last two hours.
We ended up missing Alessio's improvements for WPS, Daniele's fixes for
the changes in structured coverage grid reader, and my wcs-eo graduation
pull request
(listing the ones I remember).

The last commit seems a merge made by David.

The big question is... how do we get the commits back?

Btw, for the record, I have a local branch that has some of the missing
bits (plus one):

!image.png|1161x144

It seems David commit was already there. Alessio's changes seem to have
been lost though.
I guess I can cherry pick the ones I have on master to get things back.
Or is there any better way?

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

3

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven’t dug much more than this.

This is quite problematic, though not the first time it’s happened (in the world).

···

On Wed, Jan 15, 2014 at 6:05 AM, Andrea Aime <andrea.aime@anonymised.com> wrote:

Hi,
not sure what happened but it seems all commits done in the last 24 hours or so
are gone from master. This happened in the last two hours.
We ended up missing Alessio’s improvements for WPS, Daniele’s fixes for
the changes in structured coverage grid reader, and my wcs-eo graduation pull request
(listing the ones I remember).

The last commit seems a merge made by David.

The big question is… how do we get the commits back?

Cheers
Andrea

–

== Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information ==

Ing. Andrea Aime

@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk

Geoserver-devel mailing list
Geoserver-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

–

Ian Schneider
Software Engineer | Boundless
ischneider@anonymised.com

4

Maybe this can be useful

Alessio@anonymised.com…3898… /C/work/geoserver/2.4.x.git/geoserver (master)
$ git fsck --lost-found
Checking object directories: 100% (256/256), done.
Checking objects: 100% (94115/94115), done.
dangling commit d84ab4764a5d6c37ccec18c3343ae26ce3583a43
dangling commit 7a8c28e765b10256b8843125fce87351a69f77fd
dangling commit 438ff03dd34b2525fa221ee962ffc3a0df854ae1
dangling commit 60b7a8772ba6ab3533d42ac2b26464009b6d88aa
dangling commit fbc784acad74cb695569efe9a8a0257abbf86a06
dangling commit 30f3a03c681301acd365127f6a30b3cec5a7ed0c
dangling commit f932391309046ef9852a8528ece517fabfcaeef7
dangling tree 42945177ff34a882889571f3106c64b03c089655
dangling tree b3d67d53ee550812924a0ad65a09a9d3133053a9
dangling commit fc113621d988ac6e37b4d74dd979a04c72246a27
dangling tree 017f1ec1ab427050bd569499b0d222d08ceccfd4
dangling commit f88fa27af71ac8261001d5265a8edba86f4dbbce
dangling commit f2ddea2dffdb7ce675c112c0b1c41a1e7a82030b
dangling commit 28ef462b92fb5a892d108cbb11bef1078034ede6
dangling commit dc09fb111ac7f956cf275d17db40a5a3eecf7cf4
dangling commit 2e15eb534842bfebd52d43cd71603340ae2f49da
dangling commit bf188ffee3634255b9022ab535f7afc1d00c6533
dangling commit bb34274b443c677bb0b782ad2a01deaebf15db36
dangling commit 839567cb253ac77d36d9299f59d0fd1c83ef8e18
dangling commit 8aa01b8f1ffbdffa1b9bef5cfee58e678f5d3e49
dangling tree 6fd2e72e427b044632d7991fa2c0a675ecee3e1c

Alessio@anonymised.com /C/work/geoserver/2.4.x.git/geoserver (master)

···

==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.

Ing. Alessio Fabiani
@alfa7691
Founder/Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 331 6233686

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven’t dug much more than this.

This is quite problematic, though not the first time it’s happened (in the world).

CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk

Geoserver-devel mailing list
Geoserver-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

On Wed, Jan 15, 2014 at 6:05 AM, Andrea Aime <andrea.aime@anonymised.com> wrote:

Hi,
not sure what happened but it seems all commits done in the last 24 hours or so
are gone from master. This happened in the last two hours.
We ended up missing Alessio’s improvements for WPS, Daniele’s fixes for
the changes in structured coverage grid reader, and my wcs-eo graduation pull request
(listing the ones I remember).

The last commit seems a merge made by David.

The big question is… how do we get the commits back?

Cheers
Andrea

–

== Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information ==

Ing. Andrea Aime

@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk

Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

–

Ian Schneider
Software Engineer | Boundless
ischneider@anonymised.com

5

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider
<ischneider@anonymised.com>wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics... it seems Alessio did a push --force, or
something like that...
there are many of those

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master
HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven't
dug much more than this.

Do you know of any way to revert those events?
I can reset master to that commit and then... do a push --force again?

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

6

On Wed, Jan 15, 2014 at 8:08 AM, Andrea Aime
<andrea.aime@anonymised.com>wrote:

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics... it seems Alessio did a push --force, or
something like that...
there are many of those

Right, force push will do that.

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master
HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven't
dug much more than this.

Do you know of any way to revert those events?
I can reset master to that commit and then... do a push --force again?

Correct but for each branch.

github enterprise allows preventing force pushes but the rest of use just
have to be careful :slight_smile:

--
Ian Schneider
Software Engineer | Boundless
ischneider@anonymised.com

7

I’m very sorry, don’t know how this could happen … I wanted to push force only a pull request on my branch.

···

==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.

Ing. Alessio Fabiani
@alfa7691
Founder/Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 331 6233686

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

On Wed, Jan 15, 2014 at 4:19 PM, Ian Schneider <ischneider@anonymised.com> wrote:

CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk

Geoserver-devel mailing list
Geoserver-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

On Wed, Jan 15, 2014 at 8:08 AM, Andrea Aime <andrea.aime@anonymised.com> wrote:

Right, force push will do that.

Correct but for each branch.

github enterprise allows preventing force pushes but the rest of use just have to be careful :slight_smile:

–

Ian Schneider
Software Engineer | Boundless
ischneider@anonymised.com

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics… it seems Alessio did a push --force, or something like that…
there are many of those

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven’t dug much more than this.

Do you know of any way to revert those events?
I can reset master to that commit and then… do a push --force again?

8

On Wed, Jan 15, 2014 at 4:19 PM, Ian Schneider
<ischneider@anonymised.com>wrote:

On Wed, Jan 15, 2014 at 8:08 AM, Andrea Aime <andrea.aime@anonymised.com
> wrote:

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics... it seems Alessio did a push --force, or
something like that...
there are many of those

Right, force push will do that.

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting master
HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I haven't
dug much more than this.

Hmm... I'm having troubles doing that, it seems that while that commit is
available on github,
https://github.com/geoserver/geoserver/commit/93fc976841c9968ffd2b6b91848103b19fd21877
,
it's not to be found in a clone, so I have nothing to reset to...

Checking if I maybe can recover it using the github api

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

9

On Wed, Jan 15, 2014 at 5:06 PM, Andrea Aime
<andrea.aime@anonymised.com>wrote:

On Wed, Jan 15, 2014 at 4:19 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

On Wed, Jan 15, 2014 at 8:08 AM, Andrea Aime <
andrea.aime@anonymised.com> wrote:

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics... it seems Alessio did a push --force, or
something like that...
there are many of those

Right, force push will do that.

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting
master HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I
haven't dug much more than this.

Hmm... I'm having troubles doing that, it seems that while that commit is
available on github,
https://github.com/geoserver/geoserver/commit/93fc976841c9968ffd2b6b91848103b19fd21877
,
it's not to be found in a clone, so I have nothing to reset to...

Checking if I maybe can recover it using the github api

Yep, with it I've managed to create a branch that can be fetched, and then
recovered master state.
Now onto 2.4.x and 2.3.x

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

10

On Wed, Jan 15, 2014 at 9:20 AM, Andrea Aime
<andrea.aime@anonymised.com>wrote:

On Wed, Jan 15, 2014 at 5:06 PM, Andrea Aime <andrea.aime@anonymised.com
> wrote:

On Wed, Jan 15, 2014 at 4:19 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

On Wed, Jan 15, 2014 at 8:08 AM, Andrea Aime <
andrea.aime@anonymised.com> wrote:

On Wed, Jan 15, 2014 at 3:51 PM, Ian Schneider <
ischneider@anonymised.com> wrote:

More troublesome - other branches have been reset to earlier state.

Check out:
https://api.github.com/repos/geoserver/geoserver/events

Ah, very useful for forensics... it seems Alessio did a push --force,
or something like that...
there are many of those

Right, force push will do that.

And look at 1944681713 (the first one when I looked)

I would guess that event 1944681630 was the culprit and resetting
master HEAD to 633fa54f0dc5ef441d120fead6a61066c4bbf444 might work - but I
haven't dug much more than this.

Hmm... I'm having troubles doing that, it seems that while that commit is
available on github,
https://github.com/geoserver/geoserver/commit/93fc976841c9968ffd2b6b91848103b19fd21877
,
it's not to be found in a clone, so I have nothing to reset to...

Checking if I maybe can recover it using the github api

Yep, with it I've managed to create a branch that can be fetched, and then
recovered master state.
Now onto 2.4.x and 2.3.x

Can you clarify what this means for those of us who haven't pull down

anything yet? Will the next update be a simple "git pull origin master"?
Will any of the history on the branch change?

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.

http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

--
*Justin Deoliveira*
Vice President, Engineering | Boundless
jdeolive@anonymised.com
@j_deolive <https://twitter.com/j_deolive&gt;

11

On Wed, Jan 15, 2014 at 5:29 PM, Justin Deoliveira <
jdeolive@anonymised.com> wrote:

Yep, with it I've managed to create a branch that can be fetched, and
then recovered master state.
Now onto 2.4.x and 2.3.x

Can you clarify what this means for those of us who haven't pull down

anything yet? Will the next update be a simple "git pull origin master"?
Will any of the history on the branch change?

Just finished restoring 2.4.x, 2.3.x and 2.2.x

Hopefully, nothing special will happen for you, here is the process I've
used to restore the branches:

1) create a branch that can be fetched from the commit id previous to
Alessio's changes (from the event api output), e.g.:

aaime@anonymised.com:/tmp$ cat 22x-recover.json

{
  "ref": "refs/heads/22x-recover",
  "sha": "dc09fb111ac7f956cf275d17db40a5a3eecf7cf4"
}

curl --user "user:password" "

https://api.github.com/repos/geoserver/geoserver/git/refs&quot; -d
@22x-recover.json -XPOST

2) git fetch geoserver
3) git checkout 2.2.x
3) git reset --hard dc09fb111ac7f956cf275d17db40a5a3eecf7cf4 (which is now
possible because the fetch above retrieved this commit again)
4) git push geoserver 2.2.x

So, in the end, I've just used a normal push to apply back the commits, and
the commit ids haven't changed.
My hope is that this will be transparent, but let me know if it's not

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

12

I just fetched and beyond the ‘recover’ branches, saw nothing alarming coming down. Nice work, Andrea.

···

On Wed, Jan 15, 2014 at 9:34 AM, Andrea Aime <andrea.aime@anonymised.com> wrote:

–

Ian Schneider
Software Engineer | Boundless
ischneider@anonymised.com

On Wed, Jan 15, 2014 at 5:29 PM, Justin Deoliveira <jdeolive@anonymised.com> wrote:

Just finished restoring 2.4.x, 2.3.x and 2.2.x

Hopefully, nothing special will happen for you, here is the process I’ve used to restore the branches:

  1. create a branch that can be fetched from the commit id previous to Alessio’s changes (from the event api output), e.g.:

aaime@anonymised.com:/tmp$ cat 22x-recover.json
{
“ref”: “refs/heads/22x-recover”,
“sha”: “dc09fb111ac7f956cf275d17db40a5a3eecf7cf4”
}

curl --user “user:password” “https://api.github.com/repos/geoserver/geoserver/git/refs” -d @22x-recover.json -XPOST

  1. git fetch geoserver

  2. git checkout 2.2.x

  3. git reset --hard dc09fb111ac7f956cf275d17db40a5a3eecf7cf4 (which is now possible because the fetch above retrieved this commit again)

  4. git push geoserver 2.2.x

So, in the end, I’ve just used a normal push to apply back the commits, and the commit ids haven’t changed.
My hope is that this will be transparent, but let me know if it’s not

Cheers

Andrea

–

== Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information ==

Ing. Andrea Aime

@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

Can you clarify what this means for those of us who haven’t pull down anything yet? Will the next update be a simple “git pull origin master”? Will any of the history on the branch change?

Yep, with it I’ve managed to create a branch that can be fetched, and then recovered master state.
Now onto 2.4.x and 2.3.x

13

On Wed, Jan 15, 2014 at 5:41 PM, Ian Schneider
<ischneider@anonymised.com>wrote:

I just fetched and beyond the 'recover' branches, saw nothing alarming
coming down. Nice work, Andrea.

Good. I plan to remove those branches later... just keeping them around in
case we need them in the next day or two (maybe because I missed something)

Cheers
Andrea

--
== Our support, Your Success! Visit http://opensdi.geo-solutions.it for
more information ==

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------