* Forwarding Rocksdb to a new sha
@ 2017-04-10 13:14 Willem Jan Withagen
2017-04-10 13:36 ` Sage Weil
0 siblings, 1 reply; 8+ messages in thread
From: Willem Jan Withagen @ 2017-04-10 13:14 UTC (permalink / raw)
To: Ceph Development
Hi,
I have submitted a PR to RocksDB that got accepted.
But now I'd like to try it in my WIP tree.
So how do I locally roll the RocksDB version forward?
Is it as simple as going into RocksDB and go:
'git pull' ??
--WjW
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 13:14 Forwarding Rocksdb to a new sha Willem Jan Withagen
@ 2017-04-10 13:36 ` Sage Weil
2017-04-10 13:45 ` Willem Jan Withagen
0 siblings, 1 reply; 8+ messages in thread
From: Sage Weil @ 2017-04-10 13:36 UTC (permalink / raw)
To: Willem Jan Withagen; +Cc: Ceph Development
On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
> Hi,
>
> I have submitted a PR to RocksDB that got accepted.
> But now I'd like to try it in my WIP tree.
>
> So how do I locally roll the RocksDB version forward?
>
> Is it as simple as going into RocksDB and go:
> 'git pull' ??
It depends on what remotes you have in the rocksdb repository; you may
have to 'git remote add upstream https://github.com/facebook/rocksdb' and
fetch that first.
Once you get the submodule on the right commit, you'll need to make a
commit in the containing ceph.git updating the submodule sha1. (I usually
use 'git gui' for this.)
sage
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 13:36 ` Sage Weil
@ 2017-04-10 13:45 ` Willem Jan Withagen
2017-04-10 13:52 ` Sage Weil
0 siblings, 1 reply; 8+ messages in thread
From: Willem Jan Withagen @ 2017-04-10 13:45 UTC (permalink / raw)
To: Sage Weil; +Cc: Ceph Development
On 10-4-2017 15:36, Sage Weil wrote:
> On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
>> Hi,
>>
>> I have submitted a PR to RocksDB that got accepted.
>> But now I'd like to try it in my WIP tree.
>>
>> So how do I locally roll the RocksDB version forward?
>>
>> Is it as simple as going into RocksDB and go:
>> 'git pull' ??
>
> It depends on what remotes you have in the rocksdb repository; you may
> have to 'git remote add upstream https://github.com/facebook/rocksdb' and
> fetch that first.
Uptil now I avoided cloning RocksDB and submitted PRs fully thru GitHub ;-)
> Once you get the submodule on the right commit, you'll need to make a
> commit in the containing ceph.git updating the submodule sha1. (I usually
> use 'git gui' for this.)
There is not that many updates to RocksDB, And my PR-commit is the
current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
So how do I forward the submodule to this SHA?
And I can actually test this release of RockDB with Ceph. Otherwise we
stay at the old version we include, and I need to keep a patch.
--WjW
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 13:45 ` Willem Jan Withagen
@ 2017-04-10 13:52 ` Sage Weil
2017-04-10 15:10 ` Willem Jan Withagen
0 siblings, 1 reply; 8+ messages in thread
From: Sage Weil @ 2017-04-10 13:52 UTC (permalink / raw)
To: Willem Jan Withagen; +Cc: Ceph Development
On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
> On 10-4-2017 15:36, Sage Weil wrote:
> > On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
> >> Hi,
> >>
> >> I have submitted a PR to RocksDB that got accepted.
> >> But now I'd like to try it in my WIP tree.
> >>
> >> So how do I locally roll the RocksDB version forward?
> >>
> >> Is it as simple as going into RocksDB and go:
> >> 'git pull' ??
> >
> > It depends on what remotes you have in the rocksdb repository; you may
> > have to 'git remote add upstream https://github.com/facebook/rocksdb' and
> > fetch that first.
>
> Uptil now I avoided cloning RocksDB and submitted PRs fully thru GitHub ;-)
>
> > Once you get the submodule on the right commit, you'll need to make a
> > commit in the containing ceph.git updating the submodule sha1. (I usually
> > use 'git gui' for this.)
>
> There is not that many updates to RocksDB, And my PR-commit is the
> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
>
> So how do I forward the submodule to this SHA?
Yeah, that makes sense!
sage
> And I can actually test this release of RockDB with Ceph. Otherwise we
> stay at the old version we include, and I need to keep a patch.
>
> --WjW
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 13:52 ` Sage Weil
@ 2017-04-10 15:10 ` Willem Jan Withagen
2017-04-10 20:13 ` Nathan Cutler
0 siblings, 1 reply; 8+ messages in thread
From: Willem Jan Withagen @ 2017-04-10 15:10 UTC (permalink / raw)
To: Sage Weil; +Cc: Ceph Development
On 10-4-2017 15:52, Sage Weil wrote:
> On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
>> On 10-4-2017 15:36, Sage Weil wrote:
>>> On Mon, 10 Apr 2017, Willem Jan Withagen wrote:
>>>> Hi,
>>>>
>>>> I have submitted a PR to RocksDB that got accepted.
>>>> But now I'd like to try it in my WIP tree.
>>>>
>>>> So how do I locally roll the RocksDB version forward?
>>>>
>>>> Is it as simple as going into RocksDB and go:
>>>> 'git pull' ??
>>>
>>> It depends on what remotes you have in the rocksdb repository; you may
>>> have to 'git remote add upstream https://github.com/facebook/rocksdb' and
>>> fetch that first.
>>
>> Uptil now I avoided cloning RocksDB and submitted PRs fully thru GitHub ;-)
>>
>>> Once you get the submodule on the right commit, you'll need to make a
>>> commit in the containing ceph.git updating the submodule sha1. (I usually
>>> use 'git gui' for this.)
>>
>> There is not that many updates to RocksDB, And my PR-commit is the
>> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
>>
>> So how do I forward the submodule to this SHA?
>
> Yeah, that makes sense!
Right,
But that did hot answer the penultimate question:
How to do it?
And most of the git help I can find, does not seem to have effect on my
current tree. Where the last commit seems to be from 7 feb....
Which is the date (I guess) the inclusion of RocksDB is rolled forward.
Or is RocksDB always at HEAD, if everything is fetched anew?
--WjW
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 15:10 ` Willem Jan Withagen
@ 2017-04-10 20:13 ` Nathan Cutler
2017-04-10 20:26 ` Willem Jan Withagen
2017-04-10 20:46 ` Willem Jan Withagen
0 siblings, 2 replies; 8+ messages in thread
From: Nathan Cutler @ 2017-04-10 20:13 UTC (permalink / raw)
To: Willem Jan Withagen, Sage Weil; +Cc: Ceph Development
>>> There is not that many updates to RocksDB, And my PR-commit is the
>>> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
>>>
>>> So how do I forward the submodule to this SHA?
>>
>> Yeah, that makes sense!
>
> Right,
>
> But that did hot answer the penultimate question:
> How to do it?
According to .gitmodules, the src/rocksdb submodule is taken from
https://github.com/ceph/rocksdb so the first thing is to get the commit
into that repo.
Once it is there, you set the submodule to that commit and then open a
PR (against ceph/ceph.git) changing the SHA1 that the src/rocksdb points
to. IIRC the trick is that when the submodule is populated you can just
"git add src/rocksdb" and git "does the right thing".
I've done this before, so it can't be too difficult ;-) I think I read
this: https://git-scm.com/book/en/v2/Git-Tools-Submodules
Here's what a commit changing the src/rocksdb submodule looks like:
smithfarm@wilbur:~/src/ceph/smithfarm/ceph> git show
f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
commit f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
Author: Nathan Cutler <ncutler@suse.com>
Date: Mon Aug 22 20:56:38 2016 +0200
build/ops: bump rocksdb submodule
Fixes a FTBFS on ppc64le
Fixes: http://tracker.ceph.com/issues/17092
Signed-off-by: Nathan Cutler <ncutler@suse.com>
diff --git a/src/rocksdb b/src/rocksdb
index fa98456..92749e8 160000
--- a/src/rocksdb
+++ b/src/rocksdb
@@ -1 +1 @@
-Subproject commit fa98456ccbd860120127ac2e91a2088fb222606e
+Subproject commit 92749e88f5d9c8dc6e6aba1ff297f21f1e7ea811
HTH,
Nathan
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 20:13 ` Nathan Cutler
@ 2017-04-10 20:26 ` Willem Jan Withagen
2017-04-10 20:46 ` Willem Jan Withagen
1 sibling, 0 replies; 8+ messages in thread
From: Willem Jan Withagen @ 2017-04-10 20:26 UTC (permalink / raw)
To: Nathan Cutler, Sage Weil; +Cc: Ceph Development
On 10-04-17 22:13, Nathan Cutler wrote:
>>>> There is not that many updates to RocksDB, And my PR-commit is the
>>>> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
>>>>
>>>> So how do I forward the submodule to this SHA?
>>>
>>> Yeah, that makes sense!
>>
>> Right,
>>
>> But that did hot answer the penultimate question:
>> How to do it?
>
> According to .gitmodules, the src/rocksdb submodule is taken from
> https://github.com/ceph/rocksdb so the first thing is to get the commit
> into that repo.
That is what I done thusfar, but in the wrong repo.
Mine is in Facebook/rocksdb ;-)
> Once it is there, you set the submodule to that commit and then open a
> PR (against ceph/ceph.git) changing the SHA1 that the src/rocksdb points
> to. IIRC the trick is that when the submodule is populated you can just
> "git add src/rocksdb" and git "does the right thing".
Now this starts making sense.
> I've done this before, so it can't be too difficult ;-) I think I read
> this: https://git-scm.com/book/en/v2/Git-Tools-Submodules
Git and 'not difficult' are three words I do not dare to use in the same
sentence. .
But I'll work it out now that I know that I was barking up the wrong repo.
Thanx,
--WjW
> Here's what a commit changing the src/rocksdb submodule looks like:
>
> smithfarm@wilbur:~/src/ceph/smithfarm/ceph> git show
> f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
> commit f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
> Author: Nathan Cutler <ncutler@suse.com>
> Date: Mon Aug 22 20:56:38 2016 +0200
>
> build/ops: bump rocksdb submodule
>
> Fixes a FTBFS on ppc64le
>
> Fixes: http://tracker.ceph.com/issues/17092
> Signed-off-by: Nathan Cutler <ncutler@suse.com>
>
> diff --git a/src/rocksdb b/src/rocksdb
> index fa98456..92749e8 160000
> --- a/src/rocksdb
> +++ b/src/rocksdb
> @@ -1 +1 @@
> -Subproject commit fa98456ccbd860120127ac2e91a2088fb222606e
> +Subproject commit 92749e88f5d9c8dc6e6aba1ff297f21f1e7ea811
>
> HTH,
> Nathan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Forwarding Rocksdb to a new sha
2017-04-10 20:13 ` Nathan Cutler
2017-04-10 20:26 ` Willem Jan Withagen
@ 2017-04-10 20:46 ` Willem Jan Withagen
1 sibling, 0 replies; 8+ messages in thread
From: Willem Jan Withagen @ 2017-04-10 20:46 UTC (permalink / raw)
To: Nathan Cutler, Sage Weil; +Cc: Ceph Development
On 10-04-17 22:13, Nathan Cutler wrote:
>>>> There is not that many updates to RocksDB, And my PR-commit is the
>>>> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39
>>>>
>>>> So how do I forward the submodule to this SHA?
>>>
>>> Yeah, that makes sense!
>>
>> Right,
>>
>> But that did hot answer the penultimate question:
>> How to do it?
>
> According to .gitmodules, the src/rocksdb submodule is taken from
> https://github.com/ceph/rocksdb so the first thing is to get the commit
> into that repo.
So the first step is this:
https://github.com/ceph/rocksdb/pull/16
And now somebody needs to merge this??
--WjW
> Once it is there, you set the submodule to that commit and then open a
> PR (against ceph/ceph.git) changing the SHA1 that the src/rocksdb points
> to. IIRC the trick is that when the submodule is populated you can just
> "git add src/rocksdb" and git "does the right thing".
>
> I've done this before, so it can't be too difficult ;-) I think I read
> this: https://git-scm.com/book/en/v2/Git-Tools-Submodules
>
> Here's what a commit changing the src/rocksdb submodule looks like:
>
> smithfarm@wilbur:~/src/ceph/smithfarm/ceph> git show
> f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
> commit f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0
> Author: Nathan Cutler <ncutler@suse.com>
> Date: Mon Aug 22 20:56:38 2016 +0200
>
> build/ops: bump rocksdb submodule
>
> Fixes a FTBFS on ppc64le
>
> Fixes: http://tracker.ceph.com/issues/17092
> Signed-off-by: Nathan Cutler <ncutler@suse.com>
>
> diff --git a/src/rocksdb b/src/rocksdb
> index fa98456..92749e8 160000
> --- a/src/rocksdb
> +++ b/src/rocksdb
> @@ -1 +1 @@
> -Subproject commit fa98456ccbd860120127ac2e91a2088fb222606e
> +Subproject commit 92749e88f5d9c8dc6e6aba1ff297f21f1e7ea811
>
> HTH,
> Nathan
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-10 20:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 13:14 Forwarding Rocksdb to a new sha Willem Jan Withagen
2017-04-10 13:36 ` Sage Weil
2017-04-10 13:45 ` Willem Jan Withagen
2017-04-10 13:52 ` Sage Weil
2017-04-10 15:10 ` Willem Jan Withagen
2017-04-10 20:13 ` Nathan Cutler
2017-04-10 20:26 ` Willem Jan Withagen
2017-04-10 20:46 ` Willem Jan Withagen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.