Commit Graph

25074 Commits

Author SHA1 Message Date
Sage Weil
2fa16422f3 Merge pull request #171 from Elbandi/master
Run wrap-and-sort and add git to build deps

Reviewed-by: Sage Weil <sage@inkank.com>
2013-03-29 08:38:22 -07:00
Sage Weil
999b307af5 Merge pull request #172 from ceph/wip-ceph-json
Wip ceph json

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-29 08:37:04 -07:00
Andras Elso
2da57d7675 debian: Add git to Build-Depends (need by check_version script)
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:54 +01:00
Andras Elso
8f5c665744 debian: Run wrap-and-sort from devscripts
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:48 +01:00
Yehuda Sadeh
d15c152702 ceph_json: add missing include file
Needed for LONG_MAX and friends

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-03-29 00:25:50 -07:00
Yehuda Sadeh
9a07ee3784 ceph_json: add template specializations
Missing template specializations for data types that
needed for 32 bit compilation

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-03-29 00:25:45 -07:00
Gary Lowell
b98251633b ceph.spec.in: Add python-argparse dependency
The python-argparse package is needed by ceph-create-keys script.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-28 17:14:33 -07:00
Gary Lowell
e950ed07c3 ceph.spec.in: Move four scripts from sbin to usr/bin
The ceph-create-keys, ceph-disk, ceph-disk-activate, and
ceph-disk-prepare scripts are built in sbin, but debian installs
them into usr/bin, and several utilities look for them there.
This commit changes the RPM to install them in /usr/bin. (Bug #3921)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-28 16:12:33 -07:00
Joao Eduardo Luis
e91405d540 ceph: propagate do_command()'s return value to user space
We were returning '1' regardless of what do_command() returned in case
of error.  This would make building tools relying on command error codes
short of useless, and forced them to rely instead on error messages.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-03-28 14:55:23 -07:00
Yehuda Sadeh
9a8ea420f7 Merge pull request #164 from dalgaaf/wip-da-fix-misc-1
some SCA related fixes
2013-03-28 13:01:51 -07:00
Samuel Just
91a8d93c91 OSD: flush pg osr on shutdown prior to put()
Fixes: #4538
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-28 11:56:49 -07:00
Dan Mick
4fafedc960 Merge pull request #167 from dmick/master
Reviewed-by: Alex Elder <elder@inktank.com>
2013-03-28 10:32:50 -07:00
Dan Mick
bf7cbdfe0e rados: remove confusing argument echo on error
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-03-28 10:10:26 -07:00
Danny Al-Gaaf
f891d5a5f8 rgw_json_enc.cc: use static_cast instead of C-Style cast
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-28 13:24:33 +01:00
Danny Al-Gaaf
8d957c1106 rgw/rgw_admin.cc: remove double checks from get_cmd()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-28 13:22:02 +01:00
Dan Mick
b9c8d4f896 librados.h: fix comment describing rados_pool_list
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-03-28 00:24:01 -07:00
Sage Weil
2429446466 radosgw-admin: fix help clitest
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 21:35:49 -07:00
Sage Weil
fe0a0e6fae Merge remote-tracking branch 'gh/next' 2013-03-27 21:27:16 -07:00
Sage Weil
f4d21c5a7b Merge pull request #159 from ceph/wip-4564
mds: Delay session close if in clientreplay

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 21:20:50 -07:00
John Wilkins
d89a63ca0c doc: Updated usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-03-27 17:13:18 -07:00
John Wilkins
bc72492727 doc: Updated usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-03-27 16:50:26 -07:00
Sage Weil
4362934a94 ceph-disk: conditionally remove mount path
umount removes it on success; only remove it here if it is still there.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 16:30:48 -07:00
Sage Weil
2ae297ccb8 ceph-disk: ignore udevadm settle return code
If we time out, just continue and let the next step fail.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 16:30:48 -07:00
Sage Weil
9844500942 upstart: try udevadm settle if osd journal isn't present
Wait briefly for the journal to appear if it isn't there yet, then give up.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 16:30:48 -07:00
Sage Weil
76a5ee3e21 Merge remote-tracking branch 'gh/wip-4556'
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-03-27 13:21:24 -07:00
Sage Weil
89c69016e1 osd: disallow classes with flags==0
They must be RD, WR, or something....

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 13:19:03 -07:00
Sage Weil
f2dda43c9e osd: EINVAL when rmw_flags is 0
A broken client (e.g., v0.56) can send a request that ends up with an
rmw_flags of 0.  Treat this as invalid and return EINVAL.

Fixes: #4556
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 13:09:31 -07:00
Sage Weil
50b831e364 osd: fix detection of non-existent class method
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 13:09:31 -07:00
Sage Weil
21a09b147d Merge pull request #141 from ceph/wip-rgw-zone-config
Wip rgw zone config

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 13:04:50 -07:00
David Zafman
b0103abdee OSD fails to start with error assert(values.size() == 2)
Remove redundant setting of dirty_info
Fix PG::upgrade() to conform to programming style
Set dirty_big_info in PG::write_info for upgrades

BUG: #4562

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
2013-03-27 11:11:39 -07:00
athanatos
c8317dde73 Merge pull request #148 from dachary/wip-4542
fix append to uninitialized buffer in FlatIndex::created

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-03-27 11:00:14 -07:00
Joe Buck
4485cb87ce Merge pull request #153 from dalgaaf/wip-da-java
Fix some small java issues
2013-03-27 10:08:24 -07:00
Sage Weil
0d98815b23 Merge pull request #160 from alram/master
Fix radosgw upstart job

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 09:59:50 -07:00
Alexandre Marangone
4db4a022c3 Fix radosgw upstart job
Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
2013-03-27 09:31:07 -07:00
Sage Weil
d4961e0ca3 Merge pull request #158 from alram/master
Change ceph apt recipe to repo in doc
2013-03-27 09:18:49 -07:00
Sam Lang
5aa5bc2cae mds: Delay session close if in clientreplay
If the mds is in clientreplay, a session close
request needs to be delayed until it reaches
active.  Otherwise, the session state gets set to
'closing', and the replay requests get dropped on the
floor.

Fixes #4564.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-03-27 11:06:28 -05:00
Alexandre Marangone
9369f91871 Change ceph::apt -> ceph::repo in doc
Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
2013-03-27 09:01:01 -07:00
Sage Weil
54f538531e Merge pull request #156 from dalgaaf/wip-da-fix-mkcephfs
Fix issues in mkcephfs

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 08:52:41 -07:00
Danny Al-Gaaf
98f6a25c03 mkcephfs.in: use 32 chars for mktemp to be more unique
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 16:50:12 +01:00
Sage Weil
68901575e2 Merge pull request #152 from dalgaaf/wip-da-fix-misc
MDS.cc: remove double is_clientreplay() check in active_start()

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 08:28:49 -07:00
Sage Weil
295c92ce91 Merge pull request #157 from ceph/wip-4539
mds: Clear backtrace updates on standby_trim_seg

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-27 08:26:25 -07:00
Danny Al-Gaaf
2cb9f96314 mkcephfs.in: cleanup rdir in MON case
Remove $rdir in MON case of 'mkcephfs -a' as soon as it's no
longer needed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 16:03:20 +01:00
Danny Al-Gaaf
a8338ee1a8 mkcephfs.in: provide a valid rdir for MONs on -a
Provide also a valid rdir for ssh as in case of OSD/MDS hosts if
mkcephfs -a is called.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 15:55:56 +01:00
Danny Al-Gaaf
38f845deb0 mkcephfs.in: use mktemp instead of dd+md5sum+awk
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 15:40:58 +01:00
Sam Lang
0e009b1bb3 mds: Clear backtrace updates on standby_trim_seg
If the mds is standby, when a segment is trimmed, we need
to clear the backtrace updates list to avoid the following
assertion when the segment is deleted.

./include/elist.h: 92: FAILED assert(_head.empty())
ceph version 0.59-478-g8befbca (8befbca77a)
(MDLog::standby_trim_segments()+0xce5) [0x6ccec5]
(MDS::C_MDS_StandbyReplayRestartFinish::finish(int)+0x39) [0x4e86b9]
(Journaler::_finish_reprobe(int, unsigned long, Context*)+0x190)
[0x6d3210]
(Filer::_probed(Filer::Probe*, object_t const&, unsigned long,
utime_t)+0x558) [0x704a88]
(Objecter::C_Stat::finish(int)+0xc0) [0x705900]
(Objecter::handle_osd_op_reply(MOSDOpReply*)+0xe38) [0x6f1df8]
(MDS::handle_core_message(Message*)+0xae8) [0x4dc318]
(MDS::_dispatch(Message*)+0x2f) [0x4dc4df]
(MDS::ms_dispatch(Message*)+0x1db) [0x4ddf7b]
(DispatchQueue::entry()+0x341) [0x81f561]
(DispatchQueue::DispatchThread::entry()+0xd) [0x79c6ad]
(()+0x7e9a) [0x7f346bb9ee9a]
(clone()+0x6d) [0x7f346a3574bd]

Fixes #4539.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-03-27 09:35:08 -05:00
Danny Al-Gaaf
0c43ac32a2 ceph_common.sh: fix typo in comment
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 14:37:49 +01:00
Danny Al-Gaaf
17029a6c7a java libcephfs: add serialVersionUID to some Exception classes
Fix for: "The serializable class does not declare a static final
serialVersionUID field" warning.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 12:38:03 +01:00
Danny Al-Gaaf
10191a9c0f CephMount.java: remove unused import
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 12:37:34 +01:00
Danny Al-Gaaf
8c962b5e3f MDS.cc: remove double is_clientreplay() check in active_start()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-27 11:05:11 +01:00
Sage Weil
3f2e71169a mon: fix crush_ops.sh tests
Make it work.  Also, make note that these aren't handled idempotently by
the mon currently.  Doh!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-26 22:47:37 -07:00