Mv bucket expiry2

[thumbot]

mv-bucket-expiry2 46c20c4	:arrow_right:	develop b593a41	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-11 13:16 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 46c20c44fe43168562ab6a13e3ed325a435caa32 onto target branch: develop b593a41b962e6c5114773e5f4a71fcfd415d9663 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Merge made by the 'recursive' strategy. c_src/atoms.h | 37 ++++++++++- c_src/eleveldb.cc | 71 ++++++++++++++++----- c_src/router.cc | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++++++ src/eleveldb.erl | 32 +++++++++- 5 files changed, 346 insertions(+), 20 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 4dc6a6e	:arrow_right:	develop b593a41	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-19 11:43 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 4dc6a6ed4742a5c377e2954e6f4ac70bbc642ee6 onto target branch: develop b593a41b962e6c5114773e5f4a71fcfd415d9663 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Merge made by the 'recursive' strategy. c_src/atoms.h | 37 ++++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 75 ++++++++++++++++----- c_src/refobjects.cc | 1 - c_src/router.cc | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 +++++++++++++ src/eleveldb.erl | 26 +++++++- 7 files changed, 348 insertions(+), 23 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 eceaa42	:arrow_right:	develop b593a41	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-19 14:44 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 eceaa424e89a890fb2c1eb362bc166038f5ef79e onto target branch: develop b593a41b962e6c5114773e5f4a71fcfd415d9663 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Merge made by the 'recursive' strategy. c_src/atoms.h | 37 ++++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 75 ++++++++++++++++----- c_src/refobjects.cc | 1 - c_src/router.cc | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 +++++++++++++ src/eleveldb.erl | 26 +++++++- 7 files changed, 348 insertions(+), 23 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 b395f42	:arrow_right:	develop b593a41	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-20 12:17 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 b395f4244aee03a708f02d82c1dab654b3bbd478 onto target branch: develop b593a41b962e6c5114773e5f4a71fcfd415d9663 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Merge made by the 'recursive' strategy. c_src/atoms.h | 37 ++++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 ++++++++++++++++++----- c_src/refobjects.cc | 1 - c_src/router.cc | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 +++++++++++++ priv/eleveldb.schema | 16 ++--- src/eleveldb.erl | 26 +++++++- 8 files changed, 365 insertions(+), 31 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 011b8a1	:arrow_right:	develop b593a41	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-20 12:46 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 011b8a13a6ad579f3a7b928941bb3202cdd253ff onto target branch: develop b593a41b962e6c5114773e5f4a71fcfd415d9663 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Merge made by the 'recursive' strategy. c_src/atoms.h | 37 ++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 +++++++++++++++---- c_src/refobjects.cc | 1 - c_src/router.cc | 185 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 26 +++++- test/eleveldb_schema_tests.erl | 6 +- 9 files changed, 360 insertions(+), 35 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 c63364d	:arrow_right:	develop 996cb43	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-01-31 15:39 > Duration: 0 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 c63364d4480ef3fe8a6bcb712656577f9c008785 onto target branch: develop 996cb43e52519d91f2f775b428dccddf500a3e94 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 37 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 ++++++++++++++---- c_src/refobjects.cc | 1 - c_src/router.cc | 189 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 26 +++++- test/eleveldb_schema_tests.erl | 6 +- 9 files changed, 364 insertions(+), 35 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 d1da36b	:arrow_right:	develop 996cb43	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-01 15:22 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 d1da36beaf541c33f99660550f3eb4e6660aa35e onto target branch: develop 996cb43e52519d91f2f775b428dccddf500a3e94 > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 ++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 ++++++++++++++---- c_src/refobjects.cc | 1 - c_src/router.cc | 189 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 26 +++++- test/eleveldb_schema_tests.erl | 6 +- 9 files changed, 366 insertions(+), 36 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 0779af7	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-02 08:38 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 0779af715765594cb03c6ce389d761531014d1b0 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 ++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 ++++++++++++++---- c_src/refobjects.cc | 1 - c_src/router.cc | 189 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 8 +- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 105 +++++++++++++++++++++++ src/eleveldb_sup.erl | 39 +++++++++ test/eleveldb_schema_tests.erl | 6 +- 12 files changed, 529 insertions(+), 36 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 fcd3622	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-02 09:26 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 fcd36229be58bb07dc2f33df346ef840077fa013 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 ++++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 84 ++++++++++++++---- c_src/refobjects.cc | 1 - c_src/router.cc | 189 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 ++++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.app.src | 3 +- src/eleveldb.erl | 8 +- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 105 +++++++++++++++++++++++ src/eleveldb_sup.erl | 37 ++++++++ test/eleveldb_schema_tests.erl | 6 +- 13 files changed, 529 insertions(+), 37 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 ab51dc6	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-02 10:55 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 ab51dc61f41ab247d1738dcf3366ba19b4c14e6a onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 67 ++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 209 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 45 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.app.src | 3 +- src/eleveldb.erl | 11 ++- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 105 +++++++++++++++++++++ src/eleveldb_sup.erl | 37 ++++++++ test/eleveldb_schema_tests.erl | 6 +- 13 files changed, 538 insertions(+), 34 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 1b630e4	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-02 11:08 > Duration: 0 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 1b630e4c7b1525a143ecd16c4da05a7480af3fa8 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 68 +++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 209 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 46 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.app.src | 3 +- src/eleveldb.erl | 11 ++- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 105 +++++++++++++++++++++ src/eleveldb_sup.erl | 37 ++++++++ test/eleveldb_schema_tests.erl | 6 +- 13 files changed, 540 insertions(+), 34 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 df3b709	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-02 11:16 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 df3b709d45757c8a364218cf3793ff536bfe1f28 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 68 +++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 209 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 46 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.app.src | 3 +- src/eleveldb.erl | 11 ++- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 105 +++++++++++++++++++++ src/eleveldb_sup.erl | 36 +++++++ test/eleveldb_schema_tests.erl | 6 +- 13 files changed, 539 insertions(+), 34 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 55ad161	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-03 12:58 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 55ad1619c94e251577147ccf8477759537537431 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 68 +++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 209 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 46 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.app.src | 3 +- src/eleveldb.erl | 11 ++- src/eleveldb_app.erl | 37 ++++++++ src/eleveldb_metadata.erl | 110 ++++++++++++++++++++++ src/eleveldb_sup.erl | 36 +++++++ test/eleveldb_schema_tests.erl | 6 +- 13 files changed, 544 insertions(+), 34 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_app.erl create mode 100644 src/eleveldb_metadata.erl create mode 100644 src/eleveldb_sup.erl ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 08609ac	:arrow_right:	develop 254cba3	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-10 07:54 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 08609ac8886fc868351a9553a913eb8475328735 onto target branch: develop 254cba3d1d78f5178f5185e28fc156cc7bba48cc > Exit Code: OK > :page_facing_up:

``` Auto-merging c_src/eleveldb.cc Auto-merging c_src/build_deps.sh Merge made by the 'recursive' strategy. c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 68 ++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 216 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 46 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 11 ++- src/eleveldb_metadata.erl | 32 ++++++ test/eleveldb_schema_tests.erl | 6 +- 10 files changed, 398 insertions(+), 33 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_metadata.erl ``` --------------------------------------------------

[tburghart]

@JeetKunDoug is there an associated PR in riak_core? I see what I assume is your working branch, a review-only PR might be good.

[JeetKunDoug]

Yea - was waiting to hear from @matthewvon about the viability of it before I PRed the riak_core change, but can WIP PR for review now...

[JeetKunDoug]

riak_core changes are in basho/riak_core#898

[thumbot]

mv-bucket-expiry2 15eafbc	:arrow_right:	develop 4e63b92	:white_check_mark: completed

Looks good! :+1:

:white_check_mark: MERGE

> Started at: 2017-02-14 11:06 > Duration: 1 seconds. > Result: OK > Message: Merge Success: mv-bucket-expiry2 15eafbc2925fb0e76bcba70dd504f1e1e583eda7 onto target branch: develop 4e63b92a34b15d620d60caf7327e173f8e470c3a > Exit Code: OK > :page_facing_up:

``` Updating 4e63b92..15eafbc Fast-forward (no commit created; -m option ignored) c_src/atoms.h | 40 +++++++- c_src/build_deps.sh | 2 +- c_src/eleveldb.cc | 68 ++++++++++--- c_src/refobjects.cc | 1 - c_src/router.cc | 216 +++++++++++++++++++++++++++++++++++++++++ c_src/router.h | 46 +++++++++ priv/eleveldb.schema | 9 -- src/eleveldb.erl | 9 ++ src/eleveldb_metadata.erl | 32 ++++++ test/eleveldb_schema_tests.erl | 6 +- 10 files changed, 397 insertions(+), 32 deletions(-) create mode 100644 c_src/router.cc create mode 100644 c_src/router.h create mode 100644 src/eleveldb_metadata.erl ``` --------------------------------------------------

[tburghart]

Grrr, GitHub makes it look so simple ... do NOT let it resolve the conflicts for you!

The mv-bucket-expiry2-try-merge branch has what you get if you do, and appears to be pulling in more than expected.

[thumbot]

mv-bucket-expiry2 08609ac	:arrow_right:	develop 4e63b92	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-02-14 11:35 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 08609ac8886fc868351a9553a913eb8475328735 onto target branch: develop 4e63b92a34b15d620d60caf7327e173f8e470c3a > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 a84e076	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-02-16 11:17 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 a84e0765f27e61be0825bc21b6ec8cf12dc5cedc onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 1ede7be	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-02-16 12:51 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 1ede7be78f4fdd422a7d7590f776c3c398c6d77c onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 188352b	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-02-21 08:40 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 188352bf5d3d7e3c9f15c0e7841421f0b991b95b onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 68b2e03	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-02-21 13:51 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 68b2e03672aa821a13072efdac5f3b8f254a8c4e onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[macintux]

There will need to be changes to reflect the riak_core code that's likely to be merged soon.

At the very least, the callback functions that handle the PID registration and receive the bucket properties must now return ok.

https://github.com/basho/riak_core/pull/898 for more details, especially the commentary at the top of https://github.com/basho/riak_core/blob/dr-th/service-poc/src/riak_core_info_service.erl

[thumbot]

mv-bucket-expiry2 140809d	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-02 11:58 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 140809dfa9735af77e5b7d9a70038f68879b9f5a onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 b1033f7	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-03 09:29 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 b1033f7efbb5bc11052aeb2c2fb76987cf05ff6c onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[macintux]

• https://github.com/basho/riak_core/pull/898 <- merged
• https://github.com/basho/riak_core/pull/904 <- pending, adds bucket_props argument to the pid-handling callbacks

[thumbot]

mv-bucket-expiry2 7710597	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-03 12:18 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 771059730fe6c35c7d50f182d6c2864fcaf4627e onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 889d7ab	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-03 12:40 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 889d7ab2268ee6c509b148ef64f2c0f7afaa6d37 onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 199e0ca	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-05 08:04 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 199e0ca9c0e703a27bd9b252374e7d4a20d8abf2 onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 8201a3a	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-06 12:02 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 8201a3aba4d229038c149af37fb6fe4a989b3c9b onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl test/bucket_expiry.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[erikleitch]

(I thought @tburghart was reviewing this one, but the riak team said this morning that I should look at it too, so I'm adding a few notes here, despite not being sure whether this is ready for review, etc)

---

• eleveldb_metadata.erl Is there a deep reason why eleveldb:property_cache() is separately called from eleveldb_metadata.erl (instead of just having riak_core call eleveldb:property_cache directly)? (Or is it leftover from an earlier architecture that has now changed?)

• In router.cc, is there a reason not to return an error atom (or message) if any of add_metadata_pid, remove_metadata_pid, or property_cache is called incorrectly? (currently, the code returns ATOM_OK for a number of these, whether or not there's an error).

  (Looks like these are in process of changing, so maybe this comment will become irrelevant)

• router.cc uses a global service callback object (gBucketPropCallback) to maintain the erlang pid to contact for bucket props. This is used both from leveldb to request bucket prop info (via leveldb_callback) and from erlang to add/remove the pid (via set_metadata_pid/remove_metadata_pid), so simultaneous access from multiple thread contexts is possible.

  Shouldn't this resource be mutex-protected to ensure that the pid isn't accessed after remove_metadata_pid has been called, or that ServiceCallback::GetPid returns true after the pid has been set?

[thumbot]

mv-bucket-expiry2 e62c4cc	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-07 05:14 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 e62c4cc1dfda066f1cde268ef45611c286e015c2 onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl test/bucket_expiry.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[macintux]

Good questions Erik.

• I think it makes sense to have a translation function between the riak_core callback data and what the NIF expects. The former was designed to be general-purpose.
• eleveldb_metadata in general is a relic of an earlier architecture, so we could move that translation function into eleveldb proper, although for the moment I'd like to leave it so we don't have to yet again touch the riak_core PR.
• The NIFs need to return ok if, and only if, riak_core should continue servicing eleveldb metadata queries. The riak_core info service code shuts down the service process if any other return value is received. So, if there is an error that means that leveldb can't use the info service, then return an error.

[macintux]

Ideally I think we'd allow eleveldb to report two categories of errors: permanent and transient. Future enhancement to the info service, perhaps.

[matthewvon]

Added locking around ServiceCallback accessors per code review.

[thumbot]

mv-bucket-expiry2 9413ecc	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-07 10:51 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 9413eccfaf72802605c4a30146e2b886e8cb281f onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl test/bucket_expiry.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[thumbot]

mv-bucket-expiry2 a15ef55	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-07 11:38 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 a15ef556e3693ebcac930b15f7c75329ebd08754 onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl test/bucket_expiry.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[matthewvon]

Wrong, maybe. In flux, absolutely. Waiting on API lock down.

[thumbot]

mv-bucket-expiry2 da8729e	:arrow_right:	develop 9099f80	:no_entry: completed

There seems to be an issue with build step **merge** ! :cloud:

:no_entry: MERGE

> Started at: 2017-03-12 14:06 > Duration: seconds. > Result: ERROR > Message: Merge Failed: mv-bucket-expiry2 da8729e2ee0f51fff6a3968aec4a70741dfa5223 onto target branch: develop 9099f80ed6836d76ceeb6a2b223cd7dac90c2aad > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: c_src/atoms.h c_src/build_deps.sh c_src/eleveldb.cc c_src/refobjects.cc priv/eleveldb.schema src/eleveldb.erl test/eleveldb_schema_tests.erl Please, commit your changes or stash them before you can merge. error: The following untracked working tree files would be overwritten by merge: c_src/router.cc c_src/router.h src/eleveldb_metadata.erl test/bucket_expiry.erl Please move or remove them before you can merge. Aborting> ``` --------------------------------------------------

[matthewvon]

This was a horrible merge. Done by hand directly to develop.