Commit Graph

39866 Commits

Author SHA1 Message Date
Loic Dachary
302b628611 tests: increase the delay waiting for a cluster event
In some cases the machine running tests may be slow enough that it takes
more than a minute for an OSD to come up. It only happens rarely and
changing the wait period from 60 seconds to 120 seconds. Is so slow
that it takes more than 2 minutes to bring an OSD up, chances are a lot
more will go wrong anyway.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 13:00:37 +01:00
Loic Dachary
a19f92cfa6 Merge pull request #3900 from dachary/wip-recursive-submodules
autogen.sh: do not submodule --force if git does not support it
2015-03-07 18:30:55 +01:00
Loic Dachary
9748d45b61 autogen.sh: do not submodule --force if git does not support it
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 17:11:58 +01:00
Loic Dachary
39adebbdaa Merge pull request #3895 from dachary/wip-recursive-submodules
doc,tests: force checkout of submodules
2015-03-07 16:53:50 +01:00
John Spray
e691d50e1d Merge pull request #3615 from ceph/wip-perf-watch
Performance watching CLI
2015-03-06 19:18:59 +00:00
Loic Dachary
3a8b8284dd doc,tests: force checkout of submodules
When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:

* a directory gmock exists in hammer
* a submodule gmock replaces the directory gmock in master
* checkout master + submodule update : gmock/.git is created
* checkout hammer : the gmock directory still contains the .git from
  master because it did not exist at the time and checkout won't
  remove untracked directories
* checkout master + submodule update : git rev-parse HEAD is
  at the desired commit although the content of the gmock directory
  is from hammer

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-06 17:16:46 +01:00
Sage Weil
1ad2f3b477 Merge pull request #3892 from cernceph/cephdisk
ceph-disk: activate-[all|journal] should suppress

Backport: hammer, giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-06 07:50:41 -08:00
Loic Dachary
75abe378fc tests: sync must also be recursive
In case a submodule URL to a nested submodule changed

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-06 15:29:22 +01:00
John Spray
8f8828abf8 Merge pull request #3718 from ceph/wip-10649
mds: new OMAP storage for sessionmap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-06 12:16:09 +00:00
John Spray
9cb5742a61 mds: new OMAP storage for sessionmap
Fixes: #10649
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-06 11:03:56 +00:00
John Spray
5a529ea4d5 osdc: add omap op perf counters
To avoid bloating the list of counters too much,
group the OMAP operations in to wr,rd,del

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-06 11:03:56 +00:00
Dan van der Ster
48491bde51 ceph-disk: activate-[all|journal] should suppress
Make the suppress-activate <device> feature work for activate-all
and activate-journal.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-03-06 11:37:32 +01:00
Kefu Chai
cabef42aa6 Merge pull request #3891 from cernceph/doc
doc: osd map cache size is a count, not MB

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-06 16:19:10 +08:00
Dan van der Ster
ef87a25f76 doc: osd map cache size is a count, not MB
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-03-06 09:05:56 +01:00
Loic Dachary
b3462c2e85 Merge pull request #3888 from dachary/wip-gmock-submodule
ceph needs gmock/gtest to be statically linked

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-06 00:55:47 +01:00
Loic Dachary
9b372fe72c ceph needs gmock/gtest to be statically linked
The ceph-test package depends on gmock and gtest and needs to statically
link them because packages are not configured to distribute the
corresponding shared library files.

Update the gmock submodule to the version that is configured with
noinst libraries that will be statically linked.

The gmock submodule is modified to reference the branch in which the
ceph specific changes have been done.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-03-06 00:23:44 +01:00
John Spray
3113fb0a85 test: add unit tests for daemonperf formatting
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:37 +00:00
John Spray
c3ef6409b2 ceph.in: add 'daemonperf' command
This is inspired by dstat and scripts/perf-watch.py, to
give a convenient live view of an interesting subset
of the performance counters from a Ceph daemon.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:35 +00:00
John Spray
33a9d7063a mds: fix type of some stats
These guys were marked as counters, but they were
updated with set(), not inc() -- so they should just
be normal u64s.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:28 +00:00
John Spray
9ec54a9e01 mon: add nicknames to some performance counters
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:27 +00:00
John Spray
c2fc5d89c5 osd: add nicks to some stats
This is a rough indication of what I find
useful.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:25 +00:00
John Spray
8d94560966 osdc: add perf counter nicknames
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:24 +00:00
John Spray
ccbf036238 mds: mark stats with nicknames
These are the stats that we would like to appear
in the new perf watch CLI mode.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:22 +00:00
John Spray
ef0a7fe93b common: add optional perf counter nickname
This has two purposes:

* Identify counters that are useful in short/summary views
  of a daemon's performance (only these have a nick set)
* Provide shortened versions of names that are suitable
  for display in a text-mode columnar view.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:19 +00:00
John Spray
5eb6e34ab7 common: remove some spurious declarations
Maybe these were defined at some point in history...

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-05 20:17:10 +00:00
Loic Dachary
a88a8f0e5c Merge pull request #3886 from ceph/wip-gmock-mirror
.gitmodule_mirrors: add gmock.git mirror

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-05 17:44:05 +01:00
Sage Weil
e7bc6735f8 .gitmodule_mirrors: add gmock.git mirror
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-05 08:29:11 -08:00
Kefu Chai
60e2bec73f Merge pull request #3846 from ceph/wip-da-gtest-use-submodules
Use git submodules for gmock/gtest

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-03-05 18:16:23 +08:00
Danny Al-Gaaf
874fbd7fe5 Merge pull request #3811 from tchaikov/fix-build-debug-xio
Fix build of `--with-debug --enable-xio`

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-05 09:10:48 +01:00
Yehuda Sadeh
2cfcb5afff Merge pull request #3861 from guangyy/wip-11001
rgw: do not pre-fetch data for HEAD requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-04 17:01:24 -08:00
Guang Yang
e32da3e7c8 rgw: do not pre-fetch data for HEAD requests
Backport: hammer

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-03-05 00:58:12 +00:00
Sage Weil
8f2b9372a7 Merge pull request #3876 from ceph/wip-rpm-ceph-test-dependencies
#10989 ceph.spec.in: loosen ceph-test's dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-04 16:11:53 -08:00
Ken Dreyer
924f85f157 ceph.spec.in: loosen ceph-test's dependencies
In Debian, the ceph-test package can be installed with any version of
ceph-common.

Prior to this commit, in RHEL, we're much more strict about which
version of the dependencies we require. We depend directly on
librados2/librbd1/libcephfs1 instead of ceph-common, and we also require
the specific versions of these libraries to match the version of
ceph-test.

For testing Ceph, it is nice to have the ability to upgrade the
librados2/librbd1/libcephfs1 libraries on a host without having to also
upgrade the ceph-test package as well.

Remove the version number requirements, and change the dependencies from
librados2/librbd1/libcephfs1 to simply "ceph-common". That will make
/etc/ceph/ and /var/log/ceph present for the tests.

http://tracker.ceph.com/issues/10989 Refs: #10989

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-04 15:18:13 -07:00
John Spray
d44c24517c Merge pull request #3804 from Ved-vampir/master
common: add perf counters description

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-04 11:43:25 +00:00
Loic Dachary
a60c883b97 Merge pull request #3869 from tchaikov/print-help-on-osd
ceph.in: print help on 'osd' or 'mon'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-04 12:26:55 +01:00
Kefu Chai
a3af64c257 ceph.in: print help on 'osd' or 'mon'
Fixes: #10888
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-03-04 17:39:02 +08:00
Ved-vampir
69161f0802 common: add perf counters description
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
2015-03-04 12:13:11 +03:00
Yan, Zheng
9539e93654 Merge pull request #3865 from ceph/wip-11011
mds: flush immediately in do_open_truncate
2015-03-04 09:52:44 +08:00
Kefu Chai
5e97992086 Merge pull request #3862 from ceph/wip-da-fix-python
Fix pep8 python issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-04 09:19:24 +08:00
John Spray
891f814f30 mds: flush immediately in do_open_truncate
Previously truncating opens were horribly laggy
for clients when the system was otherwise idle,
as they would wait for the next tick() before
proceeding.

Fixes: #11011
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-03 20:14:28 +00:00
Danny Al-Gaaf
26b6b01307 rados.py: fix pep8 E502, remove redundant '\' in brackets
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
1396ac95c3 rados.py: fix pep E711
Fix for:
- E711 comparison to None should be 'if cond is None:'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
41a8c07923 rados.py: fix pep8 indent issues
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
12da819695 rados.py: fix (white)space issues
Fixes for:
- E202 whitespace before '}'
- E221 multiple spaces before operator
- E223 tab before operator
- E226 missing whitespace around arithmetic operator
- E251 unexpected spaces around keyword / parameter equals
- E261 at least two spaces before inline comment
- W293 blank line contains whitespace

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
6d078a3a76 rados.py: fix pep8 E111 indentation (spaces/tab)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
13afbc3543 ceph_rest_api.py: fix pep8 indentation errors
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
e13d4dfe34 ceph_rest_api.py: fix pep8 whitespace issues
Fixes for:
- E226 missing whitespace around arithmetic operator
- E231 missing whitespace after ':' and ','
- E265 block comment should start with '#

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
8c8cdf2854 ceph_argparse.py: pep8 E721 don't compare types, use 'isinstance()'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
0cc142393f python: fix pep8 'E713 test for membership should be 'not in'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:45 +01:00
Danny Al-Gaaf
c64d491601 ceph_argparse.py: fix pep8 indentation errors
Fix for:
- E126 continuation line over-indented for hanging indent
- E128 continuation line under-indented for visual indent
- E129 visually indented line with same indent as next logical line
- E131 continuation line unaligned for hanging indent

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:31 +01:00