Sage Weil
c1b28591a2
radosgw: log to /var/log/ceph instead of /var/log/radosgw
...
This is simpler.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 18:05:59 -04:00
Sage Weil
97ea80ca41
Merge remote-tracking branch 'gh/infernalis'
2015-09-15 09:40:53 -04:00
Kefu Chai
5dfcd3ffc5
Merge pull request #5916 from xiaoxichen/fix1
...
os/OSD.cc cast osd_max_write_size to int64_t
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:25:15 +08:00
Loic Dachary
a59cd6f92a
Merge pull request #5940 from flyd1005/master
...
doc: Fixes a wrong directory name and a broken hyperlink
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-09-15 15:22:33 +02:00
Kefu Chai
422d290cc6
Merge pull request #5912 from badone/bug_7822
...
examples: hello_world.cc: fix the displayed content
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:18:21 +08:00
Kefu Chai
646e53c17a
Merge pull request #5933 from dachary/wip-max-stale
...
common: osd_pg_epoch_persisted_max_stale < map_cache_size
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:14:51 +08:00
Li Peng
71f6529573
doc: fix a broken hyperlink
...
Signed-off-by: Li Peng <lip@dtdream.com>
2015-09-15 20:55:08 +08:00
Sage Weil
4b3ccc693c
Merge pull request #5934 from cernceph/wip-logrotate
...
logrotate: logs are now owned by ceph:ceph
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-15 08:21:51 -04:00
Li Peng
bbe27dc6d7
doc: Fixes a wrong directory name.
...
Signed-off-by: Li Peng <lip@dtdream.com>
2015-09-15 20:06:39 +08:00
John Spray
98ded95aa4
Merge pull request #5937 from ukernel/wip-13067
...
Wip 13067
Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-15 11:36:56 +01:00
Brad Hubbard
26bcb362f4
Examples: hello_world.cc, content displayed after read is not null terminated.
...
Copy contents of bufferlist to a string before sending to stdout since a
bufferlist is not null terminated.
Fixes : #7822
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-09-15 18:58:44 +10:00
Yan, Zheng
4e8242a049
mds: reset MDSRank heartbeat timeout even when MDS is laggy
...
Fixes : #13067
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-15 16:34:48 +08:00
Loic Dachary
807a34cc0d
common: osd_pg_epoch_persisted_max_stale < map_cache_size
...
1ff51a299d
reduced map_cache_size to 200,
osd_pg_epoch_persisted_max_stale must be lowered because it does not
make sense for it to be the equal or greater than map_cache_size.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-15 10:15:24 +02:00
Dan van der Ster
73d7bed94c
logrotate: logs are now owned by ceph:ceph
...
Add the su directive to avoid this error during logrotate:
error: skipping "/var/log/ceph/ceph-osd.0.log" because parent
directory has insecure permissions (It's world writable or writable
by group which is not "root") Set "su" directive in config file to
tell logrotate which user/group should be used for rotation.
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-09-15 09:10:59 +02:00
Xiaoxi Chen
7250fb18fb
os/OSD.cc cast osd_max_write_size to int64_t
...
Otherwise overflow may occur and negative values generated.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2015-09-15 09:33:35 +08:00
Sage Weil
7d89225acc
Merge pull request #5923 from ceph/wip-limits
...
set limits in systemd unit files
2015-09-14 16:40:22 -04:00
Sage Weil
8e13d89f0f
systemd: eliminate ceph-rgw tmpfiles.d file
...
This is for storing the rgw socket files for fastcgi, which we do not
want to enable by default.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
367c794cb1
systemd: no need to preprocess ceph-osd@service
...
This used to be necessary but now is not.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
8453a89cb2
systemd: set nofile limit in unit files
...
Make it big so hopefully nobody has to change it.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
1ff51a299d
osd: drop default map cache size from 500 -> 200
...
OSDs don't need this from each other anymore since they send
a pg_interval_map_t with pg notify. This cache is only used
during startup when loading things up (and 200 is still > the
max advance of 150), and when clients appear with super old maps
(pretty unusual unless they are idle for long periods).
It should mean a pretty significant cut in memory...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 12:31:42 -04:00
Sage Weil
8678a8acec
kill /etc/security/limits.d/ceph
...
This only affects login shells; not useful.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 12:04:50 -04:00
Sage Weil
27d1e4d41e
Merge pull request #5901 from yuyuyu101/wip-13001
...
AsyncMessenger: Kepp file_lock hold when accessing its event field
2015-09-13 09:12:39 -04:00
Sage Weil
786f23c5bd
Merge pull request #5626 from majianpeng/objecter
...
Objecter: fix bus about objecter.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-13 09:12:25 -04:00
Sage Weil
c625671c58
Merge pull request #5840 from liewegas/wip-12991
...
qa/workunits/cephtool/test.sh: make mds epoch check more tolerant
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-13 09:08:57 -04:00
Sage Weil
770a573b0b
Merge remote-tracking branch 'gh/infernalis'
2015-09-13 07:45:30 -04:00
Sage Weil
e73ac661a4
Merge pull request #5686 from liewegas/wip-hammer-feature
...
require osds are hammer v0.94.4 or later before upgrading past hammer
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-13 07:41:56 -04:00
Sage Weil
cac601d631
Merge pull request #5905 from ceph/wip-rpm-notcmalloc
...
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
2015-09-12 20:44:05 -04:00
Sage Weil
f8c66b4116
Merge pull request #5904 from ceph/wip-submodules
...
fix a few submodule issues
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-12 20:43:48 -04:00
Sage Weil
af39f98b53
.gitignore: ignore src/ceph.tmpe
...
It makes the gitbuilders unhappy. Not sure where it comes from...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 17:43:52 -04:00
Sage Weil
98302adf99
gmock: ignore *.pyc
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:21:32 -04:00
Sage Weil
c57e8688fe
rocksdb: ignore m4
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:17:01 -04:00
Sage Weil
51abff1168
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:12:20 -04:00
Sage Weil
4a5a5b3705
qa/workunits/cephtool/test.sh: make mds epoch check more tolerant
...
This can race with an actual mdsmap epoch update for some other
reason. We just need to make sure the epoch *increased*, not that
it is exactly old + 1.
Fixes : #12991
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 13:51:13 -04:00
Sage Weil
a511c24547
Merge remote-tracking branch 'gh/wip-10617-again'
2015-09-12 13:45:09 -04:00
Kefu Chai
9429b7735f
Merge pull request #5334 from majianpeng/read-len-zero-for-ec
...
make read ec-object(offset=0, len=0) can work like read no-ec object.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-13 00:05:27 +08:00
Sage Weil
d33fea5d38
sd/PG: tolerate missing pgmeta object
...
Bug 10617 left stray PG dirs around in firefly. Hammer correctly
ignores these, assuming they are leftover cruft. We broke this
when we dropped compat support in cd4e676e6d
See also #13060 .
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 09:20:02 -04:00
Sage Weil
f15d9585ed
osd: allow peek_map_epoch to return an error
...
Allow PG::peek_map_epoch to return an error indicating the PG
should be skipped.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 09:20:02 -04:00
Sage Weil
2e44373eac
Merge pull request #5776 from wonzhq/tmap-update
...
osd: force promote for ops which ec base pool can't handle
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-12 09:19:20 -04:00
Sage Weil
ff9600a6ce
osd/ReplicatedPG: remove stray debug line
...
This snuck in
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 08:33:44 -04:00
Haomai Wang
6e85433832
AsyncMessenger: Kepp file_lock hold when accessing its event field
...
When process_event get a file event, other thread may delete this event later
but before we do event
Fix #13001
Signed-off-by: Haomai Wang <haomai@xsky.io>
2015-09-12 17:34:39 +08:00
Sage Weil
78de6fd61d
Merge pull request #5896 from liewegas/wip-fix-spec
...
ceph.spec: include /etc/sysconfig/ceph
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-11 13:02:29 -04:00
Sage Weil
4dea76e028
ceph.spec: include /etc/sysconfig/ceph
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 12:19:59 -04:00
Sage Weil
f5c8735d61
Merge pull request #5895 from jcsp/wip-doc-default-pools
...
doc: remove references to default data/metadata pools
2015-09-11 11:56:29 -04:00
John Spray
865708120f
doc: remove references to default data/metadata pools
...
These haven't existed since 0.84 -- the cephfs documentation
was updated at the time, but there were also references in the
rados documentation.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-11 16:46:52 +01:00
Sage Weil
89e2c28c9d
Merge pull request #5803 from ceph/wip-debian-systemd
...
debian systemd support; /etc/{sysconfig,default}/ceph; easy jemalloc enablement
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:42:36 -04:00
Sage Weil
c3d23caddf
ceph-common: explicitly trigger /run/ceph creation
...
This doesn't happen magically on debian.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:47 -04:00
Sage Weil
ea91c4ef85
systemd: tmpfiles.d in /run, not /var/run
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:47 -04:00
Sage Weil
c92d13b041
debian: fix location of tmpfiles.d
...
/usr/lib/tmpfiles.d, not /lib/tmpfiles.d
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
7384a14f24
debian/rules: install systemd files and /etc/default/ceph
...
Fix the systemd units to use /etc/default instead of /etc/sysconfig. There
is probably a better way...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
cd4bd80a34
Makefile.am: include etc in tarball
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00