John Spray
387f728070
Merge pull request #5164 from ceph/wip-12088
...
client: reference counting 'struct Fh'
Reviewed-by: John Spray <john.spray@redhat.com>
2015-07-13 13:35:54 +01:00
John Spray
1b0842ba10
Merge pull request #5201 from ceph/wip-12272
...
tools: Fix rados export to use io_ctx in the right way
Reviewed-by: John Spray <john.spray@redhat.com>
2015-07-13 08:35:44 +01:00
David Zafman
ce02801b4c
tools: Fix rados export to use io_ctx in the right way
...
Cause by: 868f6b7626
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 14:59:45 -07:00
David Zafman
661205899b
Merge pull request #5197 from ceph/wip-cot-meta
...
Wip cot meta
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-10 14:31:10 -07:00
Loic Dachary
7ec0b917e6
Merge pull request #5198 from tchaikov/wip-doc-erasure-fix
...
doc/erasure-code: fix couple typos
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-10 21:34:58 +02:00
Kefu Chai
cb03f81b61
doc/erasure-code: fix couple typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-11 01:47:48 +08:00
David Zafman
127a5f191d
tools, test: Some ceph-objectstore-tool error handling fixes
...
Improve various error messages generated with invalid syntax
Add test cases for most of these error messages
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
a3b14ede9e
test: Add debug argument to the ceph-objectstore-tool test
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
d8460714fa
tools: Check for valid --op earlier so we can get a better error message
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
31fa89f249
tools, test: Add ceph-objectstore-tool to operate on the meta collection
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
6aec38b51f
tools: Fix newlines in output of --op list
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
fd1772e0ac
tools: Fix dump-super which doesn't require pgid
...
A valid pgid had to be specified in order for superblock to be displayed,
but it was otherwise ignored.
Fix message that didn't include dump-super
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
David Zafman
5534bc8648
tools: Check and specify commands that require the pgid specification
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 10:10:43 -07:00
Yehuda Sadeh
4a179eea52
Merge pull request #4404 from rzarzynski/wip-11431
...
rgw: fix lack of account name attribute in XML-formatted bucket listing of Swift account
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-10 09:30:24 -07:00
Yehuda Sadeh
014353ded2
Merge pull request #5078 from rzarzynski/wip-12158
...
rgw: send Content-Length in response for GET on Swift account.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-10 09:06:08 -07:00
Sage Weil
b30610c5bc
Merge branch 'wip-temp'
...
Conflicts:
src/osd/ReplicatedPG.cc
src/test/osd/RadosModel.h
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-10 11:35:23 -04:00
David Zafman
557c6530a5
osd, tools: Always filter temp objects since not being exported
...
Can't use object_locator_to_pg() directly with a temp object
because the pool is negative.
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 11:30:17 -04:00
David Zafman
4fcf5dd370
tools: Don't export temporary objects until we have persistent-temp objects
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 11:30:14 -04:00
David Zafman
fb22a9fa2f
osd: fix temp clearing in OSD
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-07-10 11:30:11 -04:00
Yan, Zheng
d934c1319b
Merge pull request #5175 from david-z/wip-mds-dump-crash
...
Fix mds dump_ops_in_flight crashing ocassionally
2015-07-10 17:24:41 +08:00
zhangzhi
f9378a9abf
Fix mds dump_ops_in_flight crashing ocassionally
2015-07-10 17:10:30 +08:00
Loic Dachary
61d5043844
Merge pull request #4977 from theanalyst/rados/wip-9737
...
rados/tool: handle --snapid correctly
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-10 10:00:11 +02:00
Haomai Wang
b3002dd0d9
Merge pull request #5185 from yuyuyu101/wip-store-test-zero
...
StoreTest: Add zero test for SyntheticTest
2015-07-10 09:50:36 +08:00
Samuel Just
fbfa5ab2f6
Merge pull request #3273 from majianpeng/fix4
...
cleanup code for RecoveyMessages
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-09 17:13:43 -07:00
Samuel Just
6763dcdad3
Merge pull request #4143 from majianpeng/ec-notsupp-omap
...
fix bugs about cache tier.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-09 17:12:28 -07:00
Samuel Just
086ad186ae
Merge pull request #4329 from majianpeng/filestore-copy
...
Filestore copy:using splice instead read/write for clone
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-09 17:10:57 -07:00
Samuel Just
87a185b01e
Merge pull request #4458 from wonzhq/dup-promote
...
osd/ReplicatedPG: need to queue op when avoiding dup promotion in maybe_handle_cache
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-09 17:10:10 -07:00
Ken Dreyer
d59caff214
Merge pull request #5075 from SUSE/wip-logrotate-requires
...
packaging: add find and which dependencies
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 15:37:15 -06:00
Nathan Cutler
8a56c48259
packaging: add find and which dependencies
...
The postrotate script in src/logrotate.conf uses the which and find utilities
to do its work. Although logrotate itself is only a Recommends, I think which
and find are so ubiquitous that it makes sense to have them as hard
dependencies.
Also, I checked and the package names which and findutils are the same on all
the RPM distros we are currently targeting in the spec file.
In Debian, find is also in a package called findutils while the package
containing 'which' is called debianutils.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 21:59:39 +02:00
Ken Dreyer
6861db790a
Merge pull request #5187 from SUSE/wip-12261
...
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.c…
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:44:57 -06:00
Ken Dreyer
ed6670fc1d
Merge pull request #5181 from SUSE/wip-snappy-devel
...
ceph.spec.in: snappy-devel for all supported distros
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:43:41 -06:00
Ken Dreyer
52e1db9bf7
Merge pull request #5180 from SUSE/wip-add-missing-specfile-bit
...
ceph.spec.in: add missing -%{release}
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:42:42 -06:00
Ken Dreyer
6a6d82d92a
Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency
...
packaging: make logrotate a hard dependency across all distros
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Conflicts:
debian/control
2015-07-09 13:40:23 -06:00
Nathan Cutler
5ce38b9536
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE
...
http://tracker.ceph.com/issues/12261 Fixes : #12261
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 21:38:46 +02:00
Ken Dreyer
bc0992f2c0
Merge pull request #5079 from SUSE/wip-12166
...
ceph.spec.in: use %_udevrulesdir to eliminate conditionals
2015-07-09 12:55:54 -06:00
Ken Dreyer
90708bc806
Merge pull request #5126 from SUSE/wip-12201
...
ceph.spec.in: /var/run/ceph fixes
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-07-09 10:32:31 -06:00
Nathan Cutler
8aa758ee7a
ceph.spec.in: use _udevrulesdir to eliminate conditionals
...
The conditionals governing where 50-rbd.rules is installed were not doing the
right thing on SUSE distros.
Start using the %_udevrulesdir RPM macro, while taking care that it is defined
and set to the right value. Use it to eliminate some conditionals around other
udev rules files as well.
http://tracker.ceph.com/issues/12166 Fixes : #12166
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 18:17:55 +02:00
Ken Dreyer
097dcfc589
Merge pull request #5172 from ceph/wip-rm-git-build-dep
...
Remove git build-time dependency
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 10:00:27 -06:00
Yehuda Sadeh
6f5b0d6e89
Merge pull request #5167 from zaitcev/wip-rgw-doc-layout
...
rgw: Document the layout of pools and objects
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-09 08:48:17 -07:00
Gregory Farnum
2a41b68a75
Merge pull request #5184 from majianpeng/compiler-fix
...
Compiler fix warning message
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-09 14:47:46 +01:00
Jianpeng Ma
8f7c163851
rgw: fix signed/unsigned compare warning.
...
rgw/rgw_op.cc: In member function 'virtual void
RGWCompleteMultipart::execute()':
rgw/rgw_op.cc:3133:27: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
if (parts->parts.size() > s->cct->_conf->rgw_multipart_part_upload_limit) {
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-07-09 21:37:16 +08:00
Jianpeng Ma
caae6c963d
test: fix signed/unsigned compare warning.
...
In file included from test/objectstore/chain_xattr.cc:29: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 = 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/chain_xattr.cc:205:314: 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) {
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-07-09 21:37:11 +08:00
Kefu Chai
28c22974e7
Merge pull request #5176 from zhouyuan/rest_bench_https
...
tools: Fix rest_bench to support https
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-09 20:02:18 +08:00
Gregory Farnum
5994346fd8
Merge pull request #5174 from yuyuyu101/fix-bufferlist-zero
...
Buffer: Fix bufferlist::zero bug
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-09 12:30:27 +01:00
Nathan Cutler
e4634ddcc1
ceph.spec.in: snappy-devel for all supported distros
...
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 13:28:22 +02:00
Nathan Cutler
1abaebd869
ceph.spec.in: make /var/run/ceph conditional
...
/var/run/ceph should only be installed on Fedora, RH/CentOS, and
all supported SUSE distros that do not have systemd (e.g. SLE11-SP3).
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 12:44:19 +02:00
Nathan Cutler
d952d59ae9
ceph.spec.in: add missing -%{release}
...
We have it everywhere else and I can't think of any reason why
it should be omitted here.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 12:27:17 +02:00
Loic Dachary
c741481cd6
Merge pull request #5179 from yghannam/yghannam-workunit-fixes-pjd
...
Workunits : suites/pjd.sh : Do make clean so make can build on curren…
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-09 12:13:56 +02:00
Loic Dachary
15b4a9e461
Merge pull request #5178 from yghannam/yghannam-workunit-fixes-chmod
...
Workunits : fs/misc/chmod.sh : Include ACL characters in permission c…
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-09 12:13:27 +02:00
Yazen Ghannam
d3dbfffefb
Workunits : fs/misc/chmod.sh : Include ACL characters in permission check.
...
Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
2015-07-09 04:36:28 -04:00