Commit Graph

34812 Commits

Author SHA1 Message Date
Sage Weil
645c28a108 rados: optionally read setxattr value from stdin
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 15:31:19 -07:00
Sage Weil
59a715a39c rados: don't add \n to getxattr
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 15:31:15 -07:00
Sage Weil
ea731ae142 qa/workunits/cephtool/test.sh: fix 'ceph df ...' tests
Broken by ee2dbdb0f5 and friends.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 13:16:49 -07:00
Sage Weil
0bd7c34140 PendingReleaseNotes: make note about rbd cache default change
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 11:37:22 -07:00
Josh Durgin
8d8b8b1128 Merge pull request #2123 from ceph/wip-rbd-flush
librbd: enable rbd cache by default; writethrough until flush

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-08-06 11:28:56 -07:00
Sage Weil
7d820123d0 Merge pull request #2205 from ceph/wip-librbd-snap-meta
librbd: fix crash with a chain of flattened images

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-06 11:08:43 -07:00
Sage Weil
c0ef8b8746 rocksdb: fix i386 build
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 10:51:33 -07:00
Sage Weil
0e9f3759cc Merge remote-tracking branch 'gh/wip-test-ceph-disk' 2014-08-06 10:41:36 -07:00
Sage Weil
6168c3c988 Merge pull request #2215 from ceph/wip-kb
mon: clean up _kb fields in json and perf counter output

Reviewed-by: John Spray <john.spray@redhat.com>
2014-08-06 10:33:36 -07:00
Sage Weil
ee2dbdb0f5 mon/PGMonitor: remove {rd,wr}_kb from pool stat dumps
These fields are replaced with corresponding *_bytes fields.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 10:33:04 -07:00
Sage Weil
4c8e3224ea mon: remove *_kb perf counters
This is an incompatible change.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 10:33:02 -07:00
Sage Weil
3179bb107a mon/PGMonitor: add _bytes perf counters
Leave the _kb ones in place for now.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 09:18:27 -07:00
Sage Weil
adb2791adf mon/PGMonitor: add _bytes fields for all usage dumps
Leave the _kb ones in place for now.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 09:14:40 -07:00
Loic Dachary
b416446cb9 Merge pull request #2165 from dachary/wip-mailmap
mailmap updates
2014-08-06 17:23:17 +02:00
Sage Weil
895318c0cd README.md: word wrap
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 08:16:21 -07:00
Sage Weil
500b95e568 README: symlink from README.md
It looks better as markdown than rendered as text via the markdown tool,
so just symlink it.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-06 08:15:35 -07:00
Sage Weil
25b9761e24 Merge pull request #2202 from xinxinsh/enable-rocksdb-log-level
Enable rocksdb log level

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-06 07:46:04 -07:00
Sage Weil
859944d3c9 test/osd/osd-test-helpers: mkdir -p for ceph-disk
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-05 16:48:30 -07:00
Sage Weil
818f5b7038 Merge pull request #2208 from lpabon/osd_dev_doc
Developer quick start guide

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-05 15:25:40 -07:00
Sage Weil
c2f58e6694 test/ceph-disk.sh: mkdir -p
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-05 15:11:18 -07:00
Samuel Just
3f9f135f37 Merge remote-tracking branch 'upstream/next' into wip-sam-testing
Conflicts:
	src/osd/OSD.cc
2014-08-05 14:06:23 -07:00
Luis Pabón
a923e2c9eb Renamed README to README.md to render in markdown
Signed-off-by: Luis Pabón <lpabon@redhat.com>
2014-08-05 14:51:16 -04:00
Luis Pabón
52cf693e8d Developer quick start guide
Signed-off-by: Luis Pabón <lpabon@redhat.com>
2014-08-05 14:48:47 -04:00
xinxin shu
c09036aca2 enable info_log_level config option for rocksdb
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2014-08-06 02:11:38 +08:00
John Wilkins
e6935dd461 Merge pull request #2206 from ceph/wip-8875
doc: be a bit more explicit about 'ceph-deploy new' in quickstart

Reviewed-by: John Wilkins <john.wilkins@inktank.com>
2014-08-05 10:21:58 -07:00
Alfredo Deza
66de51d1a5 be a bit more explicit about 'ceph-deploy new' in quickstart
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-08-05 12:52:00 -04:00
Sage Weil
3876da15b6 Merge branch 'master' of github.com:ceph/ceph 2014-08-05 09:15:34 -07:00
Sage Weil
bc1d2b8328 Merge remote-tracking branch 'gh/wip-8880'
Conflicts:
	src/osd/OSD.cc
2014-08-05 09:15:12 -07:00
Alfredo Deza
19b9ee947d Merge pull request #2204 from osynge/wip-dont-mkdir-by-mistake2
Do not make directories by mistake.

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2014-08-05 11:50:57 -04:00
Sage Weil
b8c1cabd94 Merge pull request #1883 from ceph/wip-msgr
messenger refactoring for xio

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-08-05 08:50:05 -07:00
Owen Synge
b4c80e31e3 Do not make directories by mistake.
Rational: I found I had created a series of OSD directories under "/dev/" when disks I thought existed did not exist.
Warning: This change will be noticed by end users and may effect deployment infrastructures.

Signed-off-by: Owen Synge <osynge@suse.com>
2014-08-05 17:28:16 +02:00
Sage Weil
e5b3c093c5 Merge pull request #2200 from theanalyst/typo
doc: typo s/loose/lose

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-05 07:57:51 -07:00
Wido den Hollander
f773b24e25 powerdns: Define a application variable when not invoked from Shell
This allows to be run directly using mod_wsgi behind Apache.
2014-08-05 16:33:03 +02:00
Abhishek Lekshmanan
1682e62eeb doc: typo s/loose/lose
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2014-08-05 10:35:03 +05:30
Sage Weil
541006c83d Merge pull request #1875 from dachary/wip-8437
erasure-code: benchmarking jerasure

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-04 17:41:53 -07:00
xinxin shu
b9b022e5de add annotation for rocksdb config option
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2014-08-05 06:24:44 +08:00
Samuel Just
dceab8dc49 Merge pull request #2198 from ceph/wip-8998
fix OSD SEGV in heartbeat()

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-04 15:12:25 -07:00
Sage Weil
8dcfbd8e3b osd: simplify dout_prefix macros
Use a get_osdmap_epoch() helper that is a bit lighter weight (by avoiding
copying around an OSDMapRef).

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-04 15:01:15 -07:00
Sage Weil
80829d7805 osd: reorder OSDService methods under proper dout_prefix macro
The dout_prefix for OSDService uses get_osdmap() to grab a shared_ptr for
the epoch printout.  The OSD one does not, and is not safe to run in all
thread contexts.

In particular, update_osd_stat() is run by the heartbeat thread and can
race with the shared_ptr itself being updated with a new map.

Ironically, if this were simply an OSDMap*, there would be no race since
the pointer is a single word and updates atomically.

Fix this, and any similar issues, by moving the OSDService methods up in
OSD.cc so that they use the safe dout macro.

Fixes: #8998
Backport: firefly (in a minimal form, I think!)
Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-04 14:57:28 -07:00
Sage Weil
0b445e0f6f Merge remote-tracking branch 'gh/next' 2014-08-04 13:56:24 -07:00
Sage Weil
047c18db6f doc/release-notes: make note about init-radosgw change
This changed back in 524aee6f95 but
was not mentioned in the release notes.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-08-04 13:48:06 -07:00
John Wilkins
354c4112a9 doc: Added 'x' to monitor cap.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-08-04 11:47:58 -07:00
Samuel Just
18b7a37c96 Merge pull request #2166 from majianpeng/bug-fix
os/FileJournal: When dump journal, using correctly seq avoid misjudging joural corrupt.

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-04 10:33:16 -07:00
Samuel Just
6878e8cdbf Merge pull request #2184 from majianpeng/fix2
ECBackend: Don't directyly use get_recovery_chunk_size() in RecoveryOp::WRITING state

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-04 10:32:07 -07:00
Samuel Just
6f05ff8f59 Merge pull request #2194 from majianpeng/fix1
osd/ECBackend: clean up assert(r==0) in continue_recovery_op.

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-04 10:31:18 -07:00
Samuel Just
3897f09a70 Merge pull request #2192 from ceph/wip-8891
msg/SimpleMessenger: drop msgr lock when joining a Pipe

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-04 10:30:25 -07:00
Yehuda Sadeh
7b2c8b3310 cls_rgw: fix object name of objects removed on object creation
Fixes: #8972
Backport: firefly, dumpling

Reported-by: Patrycja Szabłowska <szablowska.patrycja@gmail.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0f8929a68a)
2014-08-04 10:04:55 -07:00
Yehuda Sadeh
8519e9ab06 rgw: need to pass need_to_wait for throttle_data()
need_to_wait wasn't passed into processor->throttle_data(). This was
broken in fix for #8937.

CID 1229541:    (PW.PARAM_SET_BUT_NOT_USED)

Backport: firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e93818df33)
2014-08-04 10:03:40 -07:00
Yehuda Sadeh
062062479a rgw: call processor->handle_data() again if needed
Fixes: #8937

Following the fix to #8928 we end up accumulating pending data that
needs to be written. Beforehand it was working fine because we were
feeding it with the exact amount of bytes we were writing.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0553890e79)
2014-08-04 09:52:51 -07:00
Sage Weil
2f44d768e7 Merge pull request #2191 from ceph/wip-rgw-need-to-wait
rgw: need to pass need_to_wait for throttle_data()

Reviewed-by: Sage Weil <sage@redhat.com>
2014-08-04 09:51:43 -07:00