Commit Graph

42833 Commits

Author SHA1 Message Date
Sage Weil
edd68e3ade Merge pull request #5188 from athanatos/wip-11687
PG::find_best_info: ignore info.les for incomplete peer

Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-16 11:03:18 -04:00
Kefu Chai
6fac064a02 Merge pull request #5238 from tweenk/out-of-tree-build-fix
Makefile: fix out-of-tree build.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-16 22:03:52 +08:00
John Spray
03c556a9e7 Merge pull request #5256 from ceph/wip-ftbfs-i386-cls-cephfs
fix the FTBFS on i386 due to libcls_cephfs

Reviewed-by: John Spray <john.spray@redhat.com>
2015-07-16 14:42:49 +01:00
Kefu Chai
039dd1ac27 Merge pull request #5255 from hjwsm1989/fix-pgmonitor
mon/PGMonitor: use poolname reference instead of get it in osdmap

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-16 21:15:03 +08:00
Krzysztof Kosiński
6ed554ce1b automake: Fix out-of-tree build.
Corrects minor Automake errors which prevented Ceph from building
when configure was invoked from a different directory than
the toplevel source directory.

Signed-off-by: Krzysztof Kosiński <krzysztof.kosinski@intel.com>
2015-07-16 10:32:34 +02:00
Kefu Chai
2d471d0def Merge pull request #5143 from trociny/fix-mds_metadata
mon: fix mds metadata

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-16 14:41:41 +08:00
Kefu Chai
cfc9f493f6 packaging: package libcls_cephfs.so
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-16 14:21:03 +08:00
Kefu Chai
0dae022ddf cls: fix the build on i386
time_t is more a arithmetic type. and it's not portable. it's always
defined as "long int" by libc. and we have no encode(int, bl), which
is expected. so a safe way is to use int64_t for presenting the mtime
returned from the stat() call.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-16 14:04:08 +08:00
huangjun
852b08fa04 mon/PGMonitor: use poolname reference instead of get it in osdmap
Signed-off-by: huangjun <hjwsm1989@gmail.com>
2015-07-16 13:53:24 +08:00
Kefu Chai
cabbecb7dd Merge pull request #4917 from hjwsm1989/wip-rest-bench
tools/rest_bench.cc: bucket is not mandatory bc we have a default one

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-16 12:19:06 +08:00
huangjun
bc56a87ea3 rest_bench: bucketname is not mandatory as we have a default name
Signed-off-by: huangjun <hjwsm1989@gmail.com>
2015-07-16 09:42:55 +08:00
huangjun
f3d34d8ff9 rest_bench: drain the work queue to fix a crash
Fixes: #3896
  Signed-off-by: huangjun <hjwsm1989@gmail.com>
2015-07-16 09:17:59 +08:00
Samuel Just
371d9baa12 PG::find_best_info: ignore info.les for incomplete peer
See included update to doc/dev/osd_internals/last_epoch_started.rst

Fixes: 11687
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-07-15 08:57:18 -07:00
Kefu Chai
7aa5e50a7b Merge pull request #5249 from tchaikov/wip-11101
ceph.in: improve the error message

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-07-15 23:53:16 +08:00
branto1
d4be59d01e Merge pull request #5110 from ceph/wip-11864-rgw-mime-types-pkg
11864: packaging: RGW depends on /etc/mime.types

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-07-15 17:49:05 +02:00
Ken Dreyer
c74a2f86a1 packaging: RGW depends on /etc/mime.types
If the mimecap RPM or mime-support DEB is not installed, then the
/etc/mime.types file is not present on the system. RGW attempts to read
this file during startup, and if the file is not present, RGW logs an
error:

  ext_mime_map_init(): failed to open file=/etc/mime.types ret=-2

Make the radosgw package depend on the mailcap/mime-support packages so
that /etc/mime.types is always available on RGW systems.

http://tracker.ceph.com/issues/11864 Fixes: #11864

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-15 09:14:15 -06:00
Sage Weil
4fe62cd7a1 Merge pull request #4699 from joehandzik/master
FileStore: Collect device partition information

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-15 09:47:22 -04:00
Sage Weil
add147b1ac Merge pull request #4876 from ceph/wip-11855
crush: fix 'ceph osd crush reweight-subtree'

Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-15 09:45:33 -04:00
Kefu Chai
aa1a5222ee ceph.in: print more detailed warning for 'ceph <type> tell'
put the full signature of "tell <target> <command> [options...]"
instead of "tell {0}.<id>", which could be misleading somehow.

Fixes: 11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-15 19:06:17 +08:00
Kefu Chai
972dc91452 ceph.in: print more detailed error message for 'tell' command
* we do not allow user specify a certain daemon when starting an
  interactive session. the existing error message could lead to
  some confusion. so put more details in it.

Fixes: #11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-15 19:05:39 +08:00
Haomai Wang
66dcbaed3c Merge pull request #5245 from yuyuyu101/wip-async-fix-18
AsyncConnection: Fix incorrect sign_message usages
2015-07-15 16:12:45 +08:00
Loic Dachary
e38e30d230 Merge pull request #5244 from zhouyuan/rgw_obj_stripe_size
rgw: doc: Fix radosgw stripe size config ref

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-07-15 07:53:35 +02:00
Loic Dachary
a41ab5603a Merge pull request #5240 from dachary/wip-ceph-release-notes
tools: src/script/ceph-release-notes normalization

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-07-15 07:52:38 +02:00
Kefu Chai
8fc049664b Merge pull request #5165 from zhouyuan/librados_default_crush_ruleset
Make librados pool_create respect default_crush_ruleset

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-15 10:37:06 +08:00
Yuan Zhou
da96a89033 librados: Make librados pool_create respect default_crush_ruleset
Make pool_create in librados use the osd_pool_default_crush_replicated_ruleset

Fixes: #11640

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-07-15 08:00:34 +08:00
Haomai Wang
bbf5842e02 AsyncConnection: Make sign_message ahead of construct message bufferlist
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-15 02:21:43 +08:00
Haomai Wang
8bbe98a1ef AsyncConnection: Fix non-fastdispatch message doesn't prepare case
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-15 01:44:14 +08:00
Yuan Zhou
8cee73255b rgw: doc: Fix radosgw stripe size config ref
s/rgw object stripe size/rgw obj stripe size
https://github.com/ceph/ceph/blob/master/src/common/config_opts.h#L1024

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-07-14 23:53:20 +08:00
Loic Dachary
069efc19ea tools: src/script/ceph-release-notes normalization
Issue an error if for the title does not start with a known prefix.
Issue an error if no issue is associated to a pull request.

Group the pull requests fixing the same issue together.

Add link to the issue and the pull request.

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-07-14 16:21:04 +02:00
Gregory Farnum
27b825bcb7 Merge pull request #5230 from majianpeng/check_ops_in_flight_cleanup
common: clean up code for OpTracker::check_ops_in_flight.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-14 15:10:34 +01:00
Jianpeng Ma
8085d26fe9 common: clean up code for OpTracker::check_ops_in_flight.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-07-14 22:02:21 +08:00
Kefu Chai
d2b6713f7a Merge pull request #5220 from vumrao/wip-vumrao-12318
doc: change tcp rcvbuf and tcp nodelay to ms tcp rcvbuf and ms tcp nodelay

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-14 20:19:21 +08:00
Vikhyat Umrao
8506822e0e doc: change tcp rcvbuf and tcp nodelay to ms tcp rcvbuf
and ms tcp nodelay

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2015-07-14 17:21:33 +05:30
Gregory Farnum
d2f3ca8377 Merge pull request #4939 from ceph/wip-offline-backward
cephfs-data-scan (offline backward file recovery)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-14 11:42:48 +01:00
Yehuda Sadeh
970195e86a Merge pull request #5190 from guce/master
radosgw-admin: after subuser modify print only once user info

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-13 15:51:35 -07:00
Yehuda Sadeh
abd46b1f92 Merge pull request #5183 from zhouyuan/rgw_max_put_size_configurable
rgw: Make RGW_MAX_PUT_SIZE configurable

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-13 15:47:56 -07:00
Yehuda Sadeh
3ec58ee216 Merge pull request #5213 from wido/wip-rgw-keepalive
rgw: If the client sends a Connection: close header respond accordingly.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-13 15:30:24 -07:00
Josh Durgin
b67d3e05d0 Merge pull request #5210 from tweenk/docs-improvements
Document librbd::parent_spec and librbd::parent_info.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-13 13:41:34 -07:00
Ken Dreyer
57fdafbf11 Merge pull request #5215 from SUSE/wip-fdupes
ceph.spec.in: do not run fdupes, even on SLE/openSUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-13 10:26:30 -06:00
Nathan Cutler
53072b9019 ceph.spec.in: do not run fdupes, even on SLE/openSUSE
In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
complains about duplicate files wasting space in the filesystem.

However, RPMLINT is not so complaining, so drop fdupes.

http://tracker.ceph.com/issues/12301 Fixes: #12301

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-13 18:17:22 +02:00
Gregory Farnum
d5dbf02202 Merge pull request #5102 from ceph/wip-mds-refactor-small
Minor MDS:: refactor

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-13 16:01:40 +01:00
Sage Weil
9d2efcc737 Merge pull request #5209 from zhouyuan/rgw_swift_user
rgw: Make vstart.sh print out swift user info

Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-13 10:15:07 -04:00
John Spray
cd6ead3583 packaging: add cephfs-data-scan
Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
John Spray
1c00b45166 tools/cephfs: add cephfs-data-scan
For scraping cephfs data pools for metadata in
backtraces, and injecting that metadata into
the cephfs metadata pool (initially offline).

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
John Spray
8eaa2f263d doc: add some docs about cephfs-data-scan
These are deliberately fairly sparse, because:
 * These tools are for experts
 * These tools may well be wrapped in a higher
   level recovery tool that orchestrates parallel
   workers at some stage.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
John Spray
ae570255dd include/ceph_fs.h: define magic LOST+FOUND ino
So that recovery tools can create this dir without
having to consult/modify InoTable.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
John Spray
ec9b4793b4 cls: add CephFS object class
For use in cephfs-data-scan for file size and mtime
recovery, by doing a set-if-greater for size/mtime
xattrs on the 0th object of a file.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
John Spray
e07a0da84a mds: include damage_flags in inter-mds encoding
...and correspondingly bump the cluster protocol
version as these structures are not versioned
themselves.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:16 +01:00
John Spray
47f6f1eda2 mds: bump required version on fnode_t encoding
So that older MDS instances can't miss/ignore
the damage flags.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:16 +01:00
John Spray
d44c7844e5 mds: add damage_flags_t to inode+frag
Used to mark inodes+fnodes with flags indicating
that particular types of damage have either
been detected (scrub/fetch) or caused (cephfs-data-scan
inject).

This should serve as a cue to the MDS to do online
repair of stats for the nodes that have been injected.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:16 +01:00