]>
git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
Haomai Wang [Wed, 8 Oct 2014 07:10:29 +0000 (15:10 +0800)]
AsyncMessenger: Remove unused option
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 8 Oct 2014 07:07:02 +0000 (15:07 +0800)]
AsyncMessenger: add comments for structures
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 8 Oct 2014 06:52:24 +0000 (14:52 +0800)]
AsyncMessenger: add copyright for async files
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 8 Oct 2014 06:11:31 +0000 (14:11 +0800)]
AsyncMessenger: Fix header file path
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 8 Oct 2014 06:08:55 +0000 (14:08 +0800)]
AsyncMessenger: move Async* related file to msg/async
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 8 Oct 2014 03:57:49 +0000 (11:57 +0800)]
AsyncConnection: Fix mark_down problem when calling send_message
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 1 Oct 2014 03:09:07 +0000 (11:09 +0800)]
AsyncConnection: Rescheduler write event when connect successfully
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 1 Oct 2014 03:02:20 +0000 (11:02 +0800)]
AsyncConnection: Avoid seq ack not send and skip sd<0 shutdown
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Tue, 30 Sep 2014 16:01:57 +0000 (00:01 +0800)]
AsyncMessenger: Avoid join when worker thread not started
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Tue, 30 Sep 2014 03:33:22 +0000 (11:33 +0800)]
AsyncConnection: mark down connection as soon as possible
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Tue, 30 Sep 2014 02:44:13 +0000 (10:44 +0800)]
AsyncConnection: make send_message directly send message possibly
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sun, 28 Sep 2014 06:15:43 +0000 (14:15 +0800)]
AsyncConnection: Reduce _try_send call
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sun, 28 Sep 2014 02:50:28 +0000 (10:50 +0800)]
AsyncConnection: Optimize _try_send avoid new/delete
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sun, 28 Sep 2014 02:31:01 +0000 (10:31 +0800)]
Asyncconnection: Fix in_seq_acked problem
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sat, 27 Sep 2014 15:34:56 +0000 (23:34 +0800)]
EventEpoll: don't need to expand epoll struct
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sat, 27 Sep 2014 15:33:47 +0000 (23:33 +0800)]
Event: Use array instead of unordered_map for file_events
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sun, 21 Sep 2014 07:20:12 +0000 (15:20 +0800)]
Event: time event can used as priority queue
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Sat, 20 Sep 2014 08:09:19 +0000 (16:09 +0800)]
Event: Change time precision from millisecond to microsecond
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 19 Sep 2014 10:11:21 +0000 (18:11 +0800)]
Event: Fix do_request bug
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 19 Sep 2014 06:22:47 +0000 (14:22 +0800)]
Event: Simply process_event impl
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 19 Sep 2014 04:29:08 +0000 (12:29 +0800)]
Event: external_event lock may stuck in dead lock
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 19 Sep 2014 03:40:47 +0000 (11:40 +0800)]
AsyncConnection: Avoid external thread access center
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 18 Sep 2014 09:32:03 +0000 (17:32 +0800)]
AsyncMessenger: Use round-robin to dispatch new connection
EventCenter won't own lock to protect data, because each EventCenter will
master own connections.
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 18 Sep 2014 07:44:45 +0000 (15:44 +0800)]
AsyncConnection: Fix incorrect usage for bufferlist::splice
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 18 Sep 2014 03:17:08 +0000 (11:17 +0800)]
AsyncConnection: Rescheduler avoid dead lock
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 18 Sep 2014 02:24:35 +0000 (10:24 +0800)]
AsyncMessenger: Check send queue when message in queue before connect ready
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 17 Sep 2014 09:22:13 +0000 (17:22 +0800)]
AsyncMessenger: Use unordered_map instead of map and remove unused codes
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Mon, 15 Sep 2014 09:52:35 +0000 (17:52 +0800)]
AsyncMsgr: Fix remote_reset segv
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 10 Sep 2014 03:11:26 +0000 (11:11 +0800)]
Reconnect when socket is shutdown
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Wed, 10 Sep 2014 02:50:45 +0000 (10:50 +0800)]
Use shared_ptr for EventCallback
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:54:36 +0000 (15:54 +0800)]
Add wake up to EventCenter
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:53:27 +0000 (15:53 +0800)]
Add support for mon library
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Tue, 2 Sep 2014 03:47:31 +0000 (11:47 +0800)]
Replace AsyncConnection* with AsyncconnectionRef
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:53:04 +0000 (15:53 +0800)]
Add EventCenter stop function
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:52:52 +0000 (15:52 +0800)]
Fix Time Event problem
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:52:33 +0000 (15:52 +0800)]
Add STANDBY state process
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:52:24 +0000 (15:52 +0800)]
Add TimeEvent to Event API
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:52:06 +0000 (15:52 +0800)]
Add event option
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:51:52 +0000 (15:51 +0800)]
Remove DispatchQueue in AsyncMessenger
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 12 Sep 2014 07:51:18 +0000 (15:51 +0800)]
Add AsyncMessenger support
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Gregory Farnum [Wed, 8 Oct 2014 02:26:20 +0000 (19:26 -0700)]
Merge pull request #2617 from ceph/wip-9628
mds: Add session to sessionmap when its state becomes opening
Reviewed-by: Greg Farnum <greg@inktank.com>
Sage Weil [Tue, 7 Oct 2014 19:40:45 +0000 (12:40 -0700)]
Merge remote-tracking branch 'gh/giant'
Conflicts:
src/osdc/Objecter.cc
Sage Weil [Tue, 7 Oct 2014 19:34:10 +0000 (12:34 -0700)]
Merge tag 'v0.86' into giant
v0.86
Jenkins [Tue, 7 Oct 2014 13:20:21 +0000 (06:20 -0700)]
0.86
Samuel Just [Tue, 7 Oct 2014 18:42:14 +0000 (11:42 -0700)]
Merge remote-tracking branch 'guangyy/wip-9008' into giant
Sage Weil [Tue, 7 Oct 2014 18:41:11 +0000 (11:41 -0700)]
Merge pull request #2631 from ceph/wip-rwtimer
DNM: osdc/Objecter: use SafeTimer; make callbacks race-tolerant
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Samuel Just [Tue, 7 Oct 2014 17:51:21 +0000 (10:51 -0700)]
Merge pull request #2489 from guangyy/wip-9008
For pgls OP, get/put budget on per list session basis, instead of per OP basis.
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
João Eduardo Luís [Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)]
Merge pull request #2655 from ceph/wip-9635
mon: fix async write completion waits
Fixes: #9635
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Sage Weil [Tue, 7 Oct 2014 15:47:44 +0000 (08:47 -0700)]
Merge pull request #2654 from dachary/wip-9677-ioprio-class
common: ceph_ioprio_string_to_class always returns -EINVAL
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 15:13:22 +0000 (08:13 -0700)]
Merge pull request #2626 from dachary/wip-rados-empty-file
tools: rados put /dev/null should write() and not create()
Reviewed-by: Sage Weil <sage@redhat.com>
Gregory Farnum [Tue, 7 Oct 2014 14:23:54 +0000 (07:23 -0700)]
Merge pull request #2652 from ceph/wip-msgr
msgr: fix remaining direct references to "new SimpleMessenger" by replacing with the factory method
Reorganize the src/msg hierarchy to push SimpleMessenger down into a subfolder to make way for organizing new in-tree implementations.
Reviewed-by: Greg Farnum <greg@inktank.com>
Sage Weil [Tue, 7 Oct 2014 13:32:53 +0000 (06:32 -0700)]
Merge pull request #2560 from ceph/wip-9418
mon: add new profiles & audit cap checks
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 13:30:46 +0000 (06:30 -0700)]
Merge pull request #2647 from ceph/wip-rm-legacy-cli
tools: remove old ceph.cc
Reviewed-by: Loic Dachary <loic@dachary.org>
Sage Weil [Tue, 7 Oct 2014 13:27:09 +0000 (06:27 -0700)]
Merge pull request #2646 from ceph/wip-osd-op-macro
rados.h: use macros to generate osd ops definitons and strings
Reviewed-by: Sage Weil <sage@redhat.com>
Jenkins [Tue, 7 Oct 2014 13:20:21 +0000 (06:20 -0700)]
0.86
Sandon Van Ness [Tue, 7 Oct 2014 13:03:36 +0000 (06:03 -0700)]
Run configure without liblttng on squeeze as well.
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Sandon Van Ness [Tue, 7 Oct 2014 13:03:36 +0000 (06:03 -0700)]
Run configure without liblttng on squeeze as well.
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Loic Dachary [Tue, 7 Oct 2014 12:06:38 +0000 (14:06 +0200)]
common: ceph_ioprio_string_to_class always returns -EINVAL
The l string is always empty because std::transform needs a
pre-allocated string. Replace with the in-place version. Add unit tests.
http://tracker.ceph.com/issues/9677 Fixes: #9677
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Tue, 7 Oct 2014 12:05:08 +0000 (14:05 +0200)]
osd: log error if set_ioprio fails to parse class
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Tue, 7 Oct 2014 12:03:39 +0000 (14:03 +0200)]
common: set_ioprio debug message including pid
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Tue, 7 Oct 2014 12:02:09 +0000 (14:02 +0200)]
common: do not set ioprio if pid is not set
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Tue, 7 Oct 2014 08:15:20 +0000 (10:15 +0200)]
Merge pull request #2653 from dachary/wip-9676-ioprio-doc
doc: missing osd prefix to ioprio config options
Reviewed-by: Mehdi Abaakouk <sileht@sileht.net>
Loic Dachary [Tue, 7 Oct 2014 08:09:46 +0000 (10:09 +0200)]
doc: missing osd prefix to ioprio config options
http://tracker.ceph.com/issues/9676 Fixes: #9676
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Sage Weil [Mon, 6 Oct 2014 15:40:16 +0000 (08:40 -0700)]
msg: move SimpleMessenger to msg/simple/
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 04:20:08 +0000 (21:20 -0700)]
librados: use Messenger factory method
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 04:21:57 +0000 (21:21 -0700)]
msg: use localized cct for derr
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 04:15:33 +0000 (21:15 -0700)]
doc/release-notes: v0.86
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Oct 2014 04:11:51 +0000 (21:11 -0700)]
Merge pull request #2651 from ceph/wip-ostool
ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
Reviewed-by: Sage Weil <sage@redhat.com>
David Zafman [Tue, 7 Oct 2014 01:26:44 +0000 (18:26 -0700)]
ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Mon, 6 Oct 2014 22:52:24 +0000 (15:52 -0700)]
Merge branch 'wip-9658' into giant
David Zafman [Mon, 6 Oct 2014 22:47:30 +0000 (15:47 -0700)]
Merge pull request #2639 from ceph/wip-9661
Fix 9661: ceph_objectstore_tool doesn't work with memstore
Reviewed-by: Samuel Just <sam.just@inktank.com>
John Spray [Fri, 3 Oct 2014 18:12:52 +0000 (19:12 +0100)]
tools: remove old ceph.cc
Signed-off-by: John Spray <john.spray@redhat.com>
Sage Weil [Mon, 6 Oct 2014 18:20:10 +0000 (11:20 -0700)]
Merge pull request #2649 from ceph/wip-os-recommend-doc-fix
doc: update kernel recommendations, add tunables link
Ilya Dryomov [Fri, 3 Oct 2014 15:23:27 +0000 (19:23 +0400)]
doc: update kernel recommendations, add tunables link
No 3.16.[0-2] - same rbd deadlock regression as in 3.15.
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Sage Weil [Mon, 6 Oct 2014 16:37:32 +0000 (09:37 -0700)]
Merge pull request #2645 from ceph/wip-9663
client: clean-up objecter on failed client init
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 6 Oct 2014 16:15:29 +0000 (09:15 -0700)]
ceph.spec: make ceph -> python-ceph dependency specify version
It does this indirectly via ceph -> ceph-common -> python-ceph, but do so
here too for clarity/consistency.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 4 Oct 2014 00:59:40 +0000 (17:59 -0700)]
msg: make messenger type configurable
Eventaully we may want to override this by passing the type in as an
arg, but let's do that later.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 6 Oct 2014 15:50:33 +0000 (08:50 -0700)]
msg/Message: drop unneeded #include
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 6 Oct 2014 15:50:48 +0000 (08:50 -0700)]
mon/MonClient: use generic Messenger factory
Signed-off-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 6 Oct 2014 07:51:05 +0000 (09:51 +0200)]
Merge pull request #2642 from johnugeorge/wip-9492-crush-giant
Crush: Backporting fixes for #9492 to giant
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Sun, 5 Oct 2014 21:18:02 +0000 (23:18 +0200)]
Merge pull request #2644 from objoo/master
Add one more case ( "=" ) and test get_str_vec as well.
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
Noah Watkins [Sun, 5 Oct 2014 20:15:13 +0000 (13:15 -0700)]
client: clean-up objecter on failed client init
During mount() the objecter isn't shutdown if the mon client fails to
initialize. Objecter asserts in destructor expect it to have been
shutdown but this skipped.
hadoop@plana85:~$ ./hadoop/bin/hadoop fs -ls /
14/10/05 12:35:50 WARN util.NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable
osdc/Objecter.cc: In function 'virtual Objecter::~Objecter()' thread
7ff422705700 time 2014-10-05 12:35:51.090776
osdc/Objecter.cc: 3927: FAILED assert(!m_request_state_hook)
ceph version
0.85-981-g25bcc39 (
25bcc39bb809e2d13beea1529e4ab92d1b61fa5b )
1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x7f) [0x7ff3f5c28f7f]
2: (Objecter::~Objecter()+0x397) [0x7ff3f5bca707]
3: (Objecter::~Objecter()+0x9) [0x7ff3f5bca8b9]
4: (Client::~Client()+0x7d) [0x7ff3f5b6770d]
5: (Client::~Client()+0x9) [0x7ff3f5b680a9]
6: (ceph_mount_info::mount(std::string const&)+0x149) [0x7ff3f5b1fa49]
7: (ceph_mount()+0x4e) [0x7ff3f5b1dcbe]
8: (Java_com_ceph_fs_CephMount_native_1ceph_1mount()+0xb7) [0x7ff4158b1c97]
9: [0x7ff41839dd68]
NOTE: a copy of the executable, or `objdump -rdS <executable>` is needed to interpret this.
terminate called after throwing an instance of 'ceph::FailedAssertion'
Aborted
fixes: #9663
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Yann Dupont [Sun, 28 Sep 2014 22:14:45 +0000 (00:14 +0200)]
Add one more case ( "=" ) and test get_str_vec as well.
Signed-off-by: Yann Dupont <yann@objoo.org>
Sage Weil [Sun, 5 Oct 2014 16:00:01 +0000 (09:00 -0700)]
Merge pull request #2641 from dachary/wip-9655-osd-tell
qa: ceph tell must retry on ENXIO
Reviewed-by: Sage Weil <sage@redhat.com>
Ilya Dryomov [Wed, 1 Oct 2014 13:02:00 +0000 (17:02 +0400)]
rados.h: use macros to generate osd ops definitons and strings
Eliminate multiple points of maintenance by using macros - no
functional changes apart from adding strings which were missing.
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Johnu George [Mon, 29 Sep 2014 17:07:44 +0000 (10:07 -0700)]
Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by indep rule. The fix for firstn rules is already
merged as part of bug #9492. Required test files are added.
Fixes: #9492
Signed-off-by: Johnu George johnugeo@cisco.com
(cherry picked from commit
234b066ba04976783d15ff2abc3e81b6cc06fb10 )
Johnu George [Wed, 24 Sep 2014 16:32:50 +0000 (09:32 -0700)]
Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by the rule.
Fixes: #9492
Signed-off-by: Johnu George <johnugeo@cisco.com>
(cherry picked from commit
6b4d1aa99718e3b367496326c1e64551330fabc0 )
Loic Dachary [Sat, 4 Oct 2014 09:45:09 +0000 (11:45 +0200)]
Merge pull request #2599 from johnugeorge/wip-9492-crush-indep
Crush: Ensuring at most num-rep osds are selected for indep rules
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
Loic Dachary [Sat, 4 Oct 2014 09:34:27 +0000 (11:34 +0200)]
qa: ceph tell must retry on ENXIO
It is expected for ceph tell to fail with ENXIO if the daemon it is
trying to join is not ready for some reason. This should be handled as a
transient error instead of a fatal error.
Add two shell functions to help with retry. They may prove useful if
other cases requiring a few retries show up.
http://tracker.ceph.com/issues/9655 Fixes: #9655
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Johnu George [Mon, 29 Sep 2014 17:07:44 +0000 (10:07 -0700)]
Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by indep rule. The fix for firstn rules is already
merged as part of bug #9492. Required test files are added.
Fixes: #9492
Signed-off-by: Johnu George johnugeo@cisco.com
Sage Weil [Sat, 4 Oct 2014 00:56:31 +0000 (17:56 -0700)]
Merge remote-tracking branch 'gh/giant'
Sage Weil [Sat, 4 Oct 2014 00:02:56 +0000 (17:02 -0700)]
Merge pull request #2640 from ceph/wip-9657
messages: provide an explicit COMPAT_VERSION in MMDSBeacon
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 3 Oct 2014 23:22:57 +0000 (16:22 -0700)]
debian/control: fix python-ceph -> ceph file move to allow upgrades
See
fe3434f41cd09433975d7d0f9dbb2fae662e4a1b .
Signed-off-by: Sage Weil <sage@redhat.com>
Greg Farnum [Fri, 3 Oct 2014 23:06:53 +0000 (16:06 -0700)]
messages: provide an explicit COMPAT_VERSION in MMDSBeacon
We weren't setting an explicit compat version and so the Message
was setting it to the head version, breaking communication with
older daemons.
Fixes: #9657
Signed-off-by: Greg Farnum <greg@inktank.com>
David Zafman [Fri, 3 Oct 2014 22:09:30 +0000 (15:09 -0700)]
MemStore: Need set/get_allow_sharded_objects() to work for ceph_objectstore_tool
Keep a bool sharded in memory and use for set/get_allow_sharded_objects()
Create a file "sharded" in the data dir when sharded is true during _save()
Check for file "sharded" during _load()
Fixes: #9661
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 3 Oct 2014 22:12:28 +0000 (15:12 -0700)]
ceph_objectstore_tool: MemStore needs a CephContext
Pass g_ceph_context to ObjectStore::create() needed by MemStore
Fixes: #9661
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 3 Oct 2014 20:45:48 +0000 (13:45 -0700)]
debian/control: BuildDepend on lsb-release
debian/rules uses it to make lttng build conditional.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 3 Oct 2014 18:58:54 +0000 (11:58 -0700)]
Merge pull request #2635 from dachary/wip-9653-ceph-disk-bootstrap-osd-giant
ceph-disk: bootstrap-osd keyring ignores --statedir (giant)
Sage Weil [Fri, 3 Oct 2014 18:58:32 +0000 (11:58 -0700)]
Merge pull request #2633 from dachary/wip-9653-ceph-disk-bootstrap-osd
ceph-disk: bootstrap-osd keyring ignores --statedir
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 3 Oct 2014 18:24:44 +0000 (11:24 -0700)]
Merge pull request #2637 from dachary/wip-9245-test-mon-pending-giant
mon: obsolete osdmonitor_prepare_command (giant)