]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoceph.spec.in: Fix up (/var)/run/ceph creation 5980/head
Boris Ranto [Fri, 18 Sep 2015 15:00:30 +0000 (17:00 +0200)]
ceph.spec.in: Fix up (/var)/run/ceph creation

Fixes: #13059
Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #5948 from flyd1005/master
Sage Weil [Fri, 18 Sep 2015 02:14:56 +0000 (22:14 -0400)]
Merge pull request #5948 from flyd1005/master

doc: delete wrong description of installing RPMs

9 years agoMerge pull request #5926 from dillaman/wip-13082
Sage Weil [Thu, 17 Sep 2015 19:09:17 +0000 (15:09 -0400)]
Merge pull request #5926 from dillaman/wip-13082

include/inline_memory: out-of-bounds read on unaligned memory

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agonew release key
Sage Weil [Thu, 17 Sep 2015 14:47:26 +0000 (10:47 -0400)]
new release key

The previous release key,

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

may have been compromised.

The new release key is

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5947 from weiqian/master
Kefu Chai [Thu, 17 Sep 2015 15:44:57 +0000 (23:44 +0800)]
Merge pull request #5947 from weiqian/master

doc: replaces 'osd host' with 'host' in ceph.conf docs.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5964 from jcsp/wip-13138
Yan, Zheng [Thu, 17 Sep 2015 12:55:34 +0000 (20:55 +0800)]
Merge pull request #5964 from jcsp/wip-13138

libcephfs: fix calling init() then mount()

9 years agolibcephfs: fix calling init() then mount() 5964/head
John Spray [Thu, 17 Sep 2015 12:46:30 +0000 (13:46 +0100)]
libcephfs: fix calling init() then mount()

Previously only ever called these separately, but
it should be allowed for callers to use one after
the other.

Fixes: #13138
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5963 from jcsp/wip-cmake-cephfs
Orit Wasserman [Thu, 17 Sep 2015 10:59:43 +0000 (12:59 +0200)]
Merge pull request #5963 from jcsp/wip-cmake-cephfs

CMake: fix libcephfs shared lib generation

9 years agoMerge pull request #5857 from ceph/wip-da-SCA-20150812
Kefu Chai [Thu, 17 Sep 2015 10:54:24 +0000 (18:54 +0800)]
Merge pull request #5857 from ceph/wip-da-SCA-20150812

SCA and compiler warning fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5870 from s09816/master
Kefu Chai [Thu, 17 Sep 2015 10:52:54 +0000 (18:52 +0800)]
Merge pull request #5870 from s09816/master

osd:the fuction osd::shutdown Lock failed.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5096 from tchaikov/wip-add-bl-const-iterator
Kefu Chai [Thu, 17 Sep 2015 10:51:36 +0000 (18:51 +0800)]
Merge pull request #5096 from tchaikov/wip-add-bl-const-iterator

common/buffer: add bufferlist::const_iterator

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoCMake: fix libcephfs shared lib generation 5963/head
John Spray [Thu, 17 Sep 2015 10:26:32 +0000 (11:26 +0100)]
CMake: fix libcephfs shared lib generation

Previously weren't generating versioned symlinks
etc, so python bindings didn't find it.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5920 from caibo2014/fix-tool-bug
Kefu Chai [Thu, 17 Sep 2015 09:09:18 +0000 (17:09 +0800)]
Merge pull request #5920 from caibo2014/fix-tool-bug

tools: ceph_monstore_tool: remove the output file when get map fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5960 from dachary/wip-13136-python3-coverage
Kefu Chai [Thu, 17 Sep 2015 08:59:00 +0000 (16:59 +0800)]
Merge pull request #5960 from dachary/wip-13136-python3-coverage

install-deps.sh: disable python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoinstall-deps.sh: disable python3 5960/head
Loic Dachary [Thu, 17 Sep 2015 07:35:11 +0000 (09:35 +0200)]
install-deps.sh: disable python3

Disable python3 support until
https://bugs.launchpad.net/ubuntu/+source/python-coverage/+bug/1496715
is fixed.

Nothing in the build process depends on python3 right now, there is no
harm disabling it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5841 from ceph/wip-12994-rbd-replay-packaging
Sage Weil [Wed, 16 Sep 2015 13:12:16 +0000 (09:12 -0400)]
Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging

#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #5946 from liewegas/wip-rgw-logdir
Sage Weil [Wed, 16 Sep 2015 13:11:33 +0000 (09:11 -0400)]
Merge pull request #5946 from liewegas/wip-rgw-logdir

radosgw: log to /var/log/ceph instead of /var/log/radosgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agodoc: delete wrong description of installing RPMs 5948/head
Li Peng [Wed, 16 Sep 2015 06:05:05 +0000 (14:05 +0800)]
doc: delete wrong description of installing RPMs

In CentOS/RHEL 6/7, gitk and git-gui are available in default repository actually.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agodoc:Replaces 'osd host' with 'host' 5947/head
weiqian [Wed, 16 Sep 2015 03:04:52 +0000 (11:04 +0800)]
doc:Replaces 'osd host' with 'host'

Signed-off-by: weiqian <weiq@dtdream.com>
9 years agoradosgw: log to /var/log/ceph instead of /var/log/radosgw 5946/head
Sage Weil [Tue, 15 Sep 2015 22:05:59 +0000 (18:05 -0400)]
radosgw: log to /var/log/ceph instead of /var/log/radosgw

This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Tue, 15 Sep 2015 21:42:42 +0000 (17:42 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5725 from liewegas/wip-scrub-stats
Sage Weil [Tue, 15 Sep 2015 21:36:47 +0000 (17:36 -0400)]
Merge pull request #5725 from liewegas/wip-scrub-stats

osd/ReplicatedPG: snaptimmer: adjust stats through ctx->delta_stats

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5925 from liewegas/wip-mon-leaks
Sage Weil [Tue, 15 Sep 2015 21:35:02 +0000 (17:35 -0400)]
Merge pull request #5925 from liewegas/wip-mon-leaks

fix various mon leaks

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5929 from liewegas/wip-osd-leaks
Sage Weil [Tue, 15 Sep 2015 21:34:13 +0000 (17:34 -0400)]
Merge pull request #5929 from liewegas/wip-osd-leaks

misc osd leaks

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5944 from tchaikov/wip-13090
John Spray [Tue, 15 Sep 2015 20:35:48 +0000 (21:35 +0100)]
Merge pull request #5944 from tchaikov/wip-13090

mds: cast numbers for mds health to string when print

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agopackaging: move rbd-replay* to ceph-common 5841/head
Ken Dreyer [Tue, 8 Sep 2015 16:41:02 +0000 (10:41 -0600)]
packaging: move rbd-replay* to ceph-common

The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agomon: debug refs on output replies 5925/head
Sage Weil [Tue, 15 Sep 2015 16:49:36 +0000 (12:49 -0400)]
mon: debug refs on output replies

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/simple: discard local queued messages on shutdown
Sage Weil [Tue, 15 Sep 2015 16:46:25 +0000 (12:46 -0400)]
msg/simple: discard local queued messages on shutdown

Otherwise these generate leak detection noise.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/Monitor: fix MonSession Leak
Sage Weil [Tue, 15 Sep 2015 16:35:46 +0000 (12:35 -0400)]
mon/Monitor: fix MonSession Leak

dispatch() does not need to keep a ref; we hold one indirectly
via the MonOpRequest.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: fix MonSession operator<<
Sage Weil [Tue, 15 Sep 2015 16:32:02 +0000 (12:32 -0400)]
mon: fix MonSession operator<<

Print the object, not its pointer.  Make output unambiguously
terminated.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: do not leak messages on shutdown
Sage Weil [Tue, 15 Sep 2015 16:28:35 +0000 (12:28 -0400)]
mon: do not leak messages on shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds: cast numbers for mds health to string when print 5944/head
Kefu Chai [Tue, 15 Sep 2015 14:08:10 +0000 (22:08 +0800)]
mds: cast numbers for mds health to string when print

MDSHealthMetric.metadata is a map<string,string>, so the num in
`m.metadata["foo"] = num` is casted to char when being printed.
they should be coverted into std::string instead.

Fixes: #13090
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge remote-tracking branch 'gh/infernalis' 5818/head
Sage Weil [Tue, 15 Sep 2015 13:40:53 +0000 (09:40 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5916 from xiaoxichen/fix1
Kefu Chai [Tue, 15 Sep 2015 13:25:15 +0000 (21:25 +0800)]
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>
9 years agoMerge pull request #5940 from flyd1005/master
Loic Dachary [Tue, 15 Sep 2015 13:22:33 +0000 (15:22 +0200)]
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>
9 years agoMerge pull request #5912 from badone/bug_7822
Kefu Chai [Tue, 15 Sep 2015 13:18:21 +0000 (21:18 +0800)]
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>
9 years agoMerge pull request #5933 from dachary/wip-max-stale
Kefu Chai [Tue, 15 Sep 2015 13:14:51 +0000 (21:14 +0800)]
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>
9 years agodoc: fix a broken hyperlink 5940/head
Li Peng [Tue, 15 Sep 2015 12:55:08 +0000 (20:55 +0800)]
doc: fix a broken hyperlink

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoMerge pull request #5934 from cernceph/wip-logrotate
Sage Weil [Tue, 15 Sep 2015 12:21:51 +0000 (08:21 -0400)]
Merge pull request #5934 from cernceph/wip-logrotate

logrotate: logs are now owned by ceph:ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: Fixes a wrong directory name.
Li Peng [Tue, 15 Sep 2015 12:06:39 +0000 (20:06 +0800)]
doc: Fixes a wrong directory name.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoMerge pull request #5937 from ukernel/wip-13067
John Spray [Tue, 15 Sep 2015 10:36:56 +0000 (11:36 +0100)]
Merge pull request #5937 from ukernel/wip-13067

Wip 13067

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoExamples: hello_world.cc, content displayed after read is not null terminated. 5912/head
Brad Hubbard [Mon, 14 Sep 2015 06:00:43 +0000 (16:00 +1000)]
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>
9 years agomds: reset MDSRank heartbeat timeout even when MDS is laggy 5937/head
Yan, Zheng [Tue, 15 Sep 2015 08:31:23 +0000 (16:31 +0800)]
mds: reset MDSRank heartbeat timeout even when MDS is laggy

Fixes: #13067
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agocommon: osd_pg_epoch_persisted_max_stale < map_cache_size 5933/head
Loic Dachary [Tue, 15 Sep 2015 06:47:19 +0000 (08:47 +0200)]
common: osd_pg_epoch_persisted_max_stale < map_cache_size

1ff51a299d20dd73a95ba55fdec57498b8c71c13 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>
9 years agologrotate: logs are now owned by ceph:ceph 5934/head
Dan van der Ster [Tue, 15 Sep 2015 07:10:59 +0000 (09:10 +0200)]
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>
9 years agoos/OSD.cc cast osd_max_write_size to int64_t 5916/head
Xiaoxi Chen [Mon, 14 Sep 2015 08:53:01 +0000 (16:53 +0800)]
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>
9 years agoos: require Sequencer arg for apply_transaction() 5929/head
Sage Weil [Tue, 15 Sep 2015 00:09:50 +0000 (20:09 -0400)]
os: require Sequencer arg for apply_transaction()

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5923 from ceph/wip-limits
Sage Weil [Mon, 14 Sep 2015 20:40:22 +0000 (16:40 -0400)]
Merge pull request #5923 from ceph/wip-limits

set limits in systemd unit files

9 years agoceph_objectstore_test: fix warnings
Sage Weil [Mon, 14 Sep 2015 19:24:08 +0000 (15:24 -0400)]
ceph_objectstore_test: fix warnings

In file included from test/objectstore/store_test.cc:34:0:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:411:5:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (expected == actual) {
                ^
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = unsigned int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = unsigned int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2003:7:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2010:7:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2080:5:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/KeyValueStore: better osr debug
Sage Weil [Mon, 14 Sep 2015 19:21:51 +0000 (15:21 -0400)]
os/KeyValueStore: better osr debug

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/KeyValueStore: kill default_osr
Sage Weil [Mon, 14 Sep 2015 19:21:41 +0000 (15:21 -0400)]
os/KeyValueStore: kill default_osr

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/newstore: better sequencer debug
Sage Weil [Mon, 14 Sep 2015 19:20:52 +0000 (15:20 -0400)]
os/newstore: better sequencer debug

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/newstore: kill default_osr
Sage Weil [Mon, 14 Sep 2015 19:20:45 +0000 (15:20 -0400)]
os/newstore: kill default_osr

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FileStore: improve debug output for sequencers
Sage Weil [Mon, 14 Sep 2015 19:19:05 +0000 (15:19 -0400)]
os/FileStore: improve debug output for sequencers

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/ObjectStore: fix leak ref on Sequencer_impl
Sage Weil [Mon, 14 Sep 2015 18:48:11 +0000 (14:48 -0400)]
os/ObjectStore: fix leak ref on Sequencer_impl

This should start at 0 refs, not 1.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FileStore: assert Sequencer is passed in; kill default_osr
Sage Weil [Mon, 14 Sep 2015 18:39:35 +0000 (14:39 -0400)]
os/FileStore: assert Sequencer is passed in; kill default_osr

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: queue all transactions under an osr
Sage Weil [Mon, 14 Sep 2015 18:37:37 +0000 (14:37 -0400)]
osd: queue all transactions under an osr

This was missed in e7bbafa3bfbd5e936a8be026a30b83a89f6121c3.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agosystemd: eliminate ceph-rgw tmpfiles.d file 5923/head
Sage Weil [Mon, 14 Sep 2015 17:52:11 +0000 (13:52 -0400)]
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>
9 years agosystemd: no need to preprocess ceph-osd@service
Sage Weil [Mon, 14 Sep 2015 14:58:15 +0000 (10:58 -0400)]
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>
9 years agosystemd: set nofile limit in unit files
Sage Weil [Mon, 14 Sep 2015 14:54:53 +0000 (10:54 -0400)]
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>
9 years agoosd: drop default map cache size from 500 -> 200
Sage Weil [Mon, 14 Sep 2015 16:31:42 +0000 (12:31 -0400)]
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>
9 years agokill /etc/security/limits.d/ceph
Sage Weil [Mon, 14 Sep 2015 14:51:33 +0000 (10:51 -0400)]
kill /etc/security/limits.d/ceph

This only affects login shells; not useful.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/inline_memory: out-of-bounds read on unaligned memory 5926/head
Jason Dillaman [Mon, 14 Sep 2015 15:23:31 +0000 (11:23 -0400)]
include/inline_memory: out-of-bounds read on unaligned memory

When checking if a >=16 byte unaligned buffer is zeroed, the 32bit
check will read outside the buffer memory range.

Fixes: #13082
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotools:remove the local file when get map failed. 5920/head
Bo Cai [Mon, 14 Sep 2015 11:19:05 +0000 (19:19 +0800)]
tools:remove the local file when get map failed.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
9 years agomon: do not return ref to MonOpRequest::get_session() caller
Sage Weil [Mon, 14 Sep 2015 14:24:22 +0000 (10:24 -0400)]
mon: do not return ref to MonOpRequest::get_session() caller

Most callers don't put the ref, and since we hold the op ref it's
not necessary.  This will also  make a somewhat cleaner transition
to MonSessionRef later.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: fix MonSession leak when waitlisting op
Sage Weil [Mon, 14 Sep 2015 13:56:57 +0000 (09:56 -0400)]
mon: fix MonSession leak when waitlisting op

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: debug MonSession refs
Sage Weil [Mon, 14 Sep 2015 02:04:29 +0000 (22:04 -0400)]
mon: debug MonSession refs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: fix use-after-free in stats ack
Sage Weil [Mon, 14 Sep 2015 01:48:47 +0000 (21:48 -0400)]
mon/PGMonitor: fix use-after-free in stats ack

The MonOpRequestRef owns one ref; we need to get() another so we
can pass it to send_reply.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: do not leak ref creating MonOpRequest
Sage Weil [Mon, 14 Sep 2015 01:44:51 +0000 (21:44 -0400)]
mon: do not leak ref creating MonOpRequest

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/simple: debug refs on sent messages
Sage Weil [Mon, 14 Sep 2015 01:42:27 +0000 (21:42 -0400)]
msg/simple: debug refs on sent messages

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MDSMonitor: drop incorrect m->put()
Sage Weil [Mon, 14 Sep 2015 01:36:29 +0000 (21:36 -0400)]
mon/MDSMonitor: drop incorrect m->put()

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5901 from yuyuyu101/wip-13001
Sage Weil [Sun, 13 Sep 2015 13:12:39 +0000 (09:12 -0400)]
Merge pull request #5901 from yuyuyu101/wip-13001

AsyncMessenger: Kepp file_lock hold when accessing its event field

9 years agoMerge pull request #5626 from majianpeng/objecter
Sage Weil [Sun, 13 Sep 2015 13:12:25 +0000 (09:12 -0400)]
Merge pull request #5626 from majianpeng/objecter

Objecter: fix bus about objecter.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5840 from liewegas/wip-12991
Sage Weil [Sun, 13 Sep 2015 13:08:57 +0000 (09:08 -0400)]
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>
9 years agoMerge remote-tracking branch 'gh/infernalis'
Sage Weil [Sun, 13 Sep 2015 11:45:30 +0000 (07:45 -0400)]
Merge remote-tracking branch 'gh/infernalis'

9 years agoMerge pull request #5686 from liewegas/wip-hammer-feature
Sage Weil [Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)]
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>
9 years agoMerge pull request #5905 from ceph/wip-rpm-notcmalloc
Sage Weil [Sun, 13 Sep 2015 00:44:05 +0000 (20:44 -0400)]
Merge pull request #5905 from ceph/wip-rpm-notcmalloc

ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS

9 years agoMerge pull request #5904 from ceph/wip-submodules
Sage Weil [Sun, 13 Sep 2015 00:43:48 +0000 (20:43 -0400)]
Merge pull request #5904 from ceph/wip-submodules

fix a few submodule issues

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years ago.gitignore: ignore src/ceph.tmpe 5904/head
Sage Weil [Sat, 12 Sep 2015 21:43:52 +0000 (17:43 -0400)]
.gitignore: ignore src/ceph.tmpe

It makes the gitbuilders unhappy.  Not sure where it comes from...

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agogmock: ignore *.pyc
Sage Weil [Sat, 12 Sep 2015 18:21:32 +0000 (14:21 -0400)]
gmock: ignore *.pyc

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorocksdb: ignore m4
Sage Weil [Sat, 12 Sep 2015 18:17:01 +0000 (14:17 -0400)]
rocksdb: ignore m4

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS 5905/head
Sage Weil [Sat, 12 Sep 2015 18:12:20 +0000 (14:12 -0400)]
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: make mds epoch check more tolerant 5840/head
Sage Weil [Sat, 12 Sep 2015 17:51:13 +0000 (13:51 -0400)]
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>
9 years agoMerge remote-tracking branch 'gh/wip-10617-again'
Sage Weil [Sat, 12 Sep 2015 17:45:09 +0000 (13:45 -0400)]
Merge remote-tracking branch 'gh/wip-10617-again'

9 years agoMerge pull request #5334 from majianpeng/read-len-zero-for-ec
Kefu Chai [Sat, 12 Sep 2015 16:05:27 +0000 (00:05 +0800)]
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>
9 years agosd/PG: tolerate missing pgmeta object
Sage Weil [Fri, 11 Sep 2015 14:16:23 +0000 (10:16 -0400)]
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 cd4e676e6d45c8166290ef834d73c2a0bda98fa2

See also #13060.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: allow peek_map_epoch to return an error
Sage Weil [Fri, 11 Sep 2015 14:15:07 +0000 (10:15 -0400)]
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>
9 years agoMerge pull request #5776 from wonzhq/tmap-update
Sage Weil [Sat, 12 Sep 2015 13:19:20 +0000 (09:19 -0400)]
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>
9 years agoosd/ReplicatedPG: remove stray debug line
Sage Weil [Sat, 12 Sep 2015 12:33:44 +0000 (08:33 -0400)]
osd/ReplicatedPG: remove stray debug line

This snuck in

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoAsyncMessenger: Kepp file_lock hold when accessing its event field 5901/head
Haomai Wang [Sat, 12 Sep 2015 09:31:10 +0000 (17:31 +0800)]
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>
9 years agoMerge pull request #5896 from liewegas/wip-fix-spec
Sage Weil [Fri, 11 Sep 2015 17:02:29 +0000 (13:02 -0400)]
Merge pull request #5896 from liewegas/wip-fix-spec

ceph.spec: include /etc/sysconfig/ceph

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoceph.spec: include /etc/sysconfig/ceph 5896/head
Sage Weil [Fri, 11 Sep 2015 16:19:59 +0000 (12:19 -0400)]
ceph.spec: include /etc/sysconfig/ceph

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5895 from jcsp/wip-doc-default-pools
Sage Weil [Fri, 11 Sep 2015 15:56:29 +0000 (11:56 -0400)]
Merge pull request #5895 from jcsp/wip-doc-default-pools

doc: remove references to default data/metadata pools

9 years agodoc: remove references to default data/metadata pools 5895/head
John Spray [Fri, 11 Sep 2015 15:46:52 +0000 (16:46 +0100)]
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>
9 years agoMerge pull request #5803 from ceph/wip-debian-systemd
Sage Weil [Fri, 11 Sep 2015 15:42:36 +0000 (11:42 -0400)]
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>
9 years agoceph-common: explicitly trigger /run/ceph creation 5803/head
Sage Weil [Tue, 8 Sep 2015 17:50:52 +0000 (13:50 -0400)]
ceph-common: explicitly trigger /run/ceph creation

This doesn't happen magically on debian.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agosystemd: tmpfiles.d in /run, not /var/run
Sage Weil [Tue, 8 Sep 2015 17:50:31 +0000 (13:50 -0400)]
systemd: tmpfiles.d in /run, not /var/run

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian: fix location of tmpfiles.d
Sage Weil [Sun, 6 Sep 2015 18:18:16 +0000 (14:18 -0400)]
debian: fix location of tmpfiles.d

/usr/lib/tmpfiles.d, not /lib/tmpfiles.d

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodebian/rules: install systemd files and /etc/default/ceph
Sage Weil [Sat, 5 Sep 2015 13:14:15 +0000 (09:14 -0400)]
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>
9 years agoMakefile.am: include etc in tarball
Sage Weil [Fri, 4 Sep 2015 17:49:09 +0000 (13:49 -0400)]
Makefile.am: include etc in tarball

Signed-off-by: Sage Weil <sage@redhat.com>