Commit Graph

31144 Commits

Author SHA1 Message Date
Gregory Farnum
d6b592c087 Merge pull request #1079 from ceph/wip-tier-bits
osd: a few tiering fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-01-22 13:44:46 -08:00
Sage Weil
8eaef4140b Merge pull request #1126 from ceph/wip-osdmapenc-fix
MOSDMap: reencode maps if target doesn't have OSDMAP_ENC

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-22 08:20:08 -08:00
Ilya Dryomov
8060afd77c MOSDMap: reencode maps if target doesn't have OSDMAP_ENC
Reencode both full and incremental maps if target doesn't know how to
decode OSDMAP_ENC maps (CEPH_FEATURE_OSDMAP_ENC bit is not set).  This
fixes a compatibility bug that was introduced in 3d7c69fb09 ("OSDMap:
add a CEPH_FEATURE_OSDMAP_ENC feature, and use new encoding").

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-22 17:34:31 +02:00
tamil
dcca41371f added perl script for rgw bucket quota tests
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2014-01-21 18:51:49 -08:00
tamil
28c75f81c1 removing rgw_tests.sh
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
(cherry picked from commit 54caa0192b)
2014-01-21 18:50:06 -08:00
tamil
54caa0192b removing rgw_tests.sh
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2014-01-21 18:44:57 -08:00
tamil
4550fb5ff9 Merge branch 'master' of github.com:ceph/ceph 2014-01-21 17:50:22 -08:00
tamil
8b8ede7a13 modified the port to 7280 in the script instead of the default 80
Signed-off-by: tamil <tamil@tamil-VirtualBox.(none)>
2014-01-21 17:50:00 -08:00
Sage Weil
81ff12ec70 Merge pull request #1124 from ceph/wip-cache-mode-fix
mon/MonCommands: 'invalidate+forward' -> 'forward'

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-21 17:30:34 -08:00
tamil
850b4f426f script for rgw bucket quota testing
Signed-off-by: tamil <tamil@tamil-VirtualBox.(none)>
2014-01-21 15:56:37 -08:00
Ilya Dryomov
339bed1b3b mon/MonCommands: 'invalidate+forward' -> 'forward'
Commit 4e439857a6 introduced invalidate+forward cache mode, commit
81279e3bb6 renamed it to forward, but missed the CLI.  Fix it.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-22 00:27:09 +02:00
Gregory Farnum
291407bc04 Merge pull request #1123 from ceph/wip-stray-mdsmaps
mon/MDSMonitor: do not generate mdsmaps from already-laggy mds
Reviewed-by: Greg Farnum <greg@inktank.com>
2014-01-21 12:04:42 -08:00
John Wilkins
ed2decb149 doc: Fixed end string from '' to `` to stop warnings. Enforced 80 char line.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-21 11:51:15 -08:00
Sage Weil
584c2dd6be mon/MDSMonitor: do not generate mdsmaps from already-laggy mds
There is one path where a mds that is not sending its beacon (e.g.,
because it is not running at all) will lead to proposal of new mdsmaps.
Fix it.

Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-21 11:29:56 -08:00
Josh Durgin
cd217ec03a Merge pull request #1119 from ceph/wip-7184
osd: ignore num_objects_dirty for old pools

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-21 10:34:20 -08:00
Ken Dreyer
4c96853409 packaging: ship libdir/ceph
Automake puts ceph_common.sh into libdir/ceph, but the Red Hat packaging
was not capturing this file.

Add the libdir/ceph location to the RPM packaging.

Fixes #7117

(cherry picked from commit 2d0d48b829)
2014-01-21 10:40:54 -05:00
John Spray
6bee1885a9 Docs: Add backfill_toofull to list of PG states
Signed-off-by: John Spray <john.spray@inktank.com>
2014-01-21 11:50:00 +00:00
Sage Weil
7a2d7f13ab Merge pull request #1120 from xylv/wip-op-process-latency-squashed
osd: Add op_process_latency in perf counter

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-20 21:34:09 -08:00
Ray Lv
78150bd9fe osd: Add op_process_latency in perf counter
Fixes: #7167

Signed-off-by: Ray Lv <xiangyulv@gmail.com>
2014-01-21 11:11:57 +08:00
Loic Dachary
67d8b72eb4 common: fix bufferlist::append(istream) test
bufferlist::append(istream) now filters out empty lines; reflect this in
the test

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 4b5f2570e9)
2014-01-20 14:50:50 -08:00
Sage Weil
368f17362d Merge pull request #1117 from jcsp/wip-7187
Fix #7187: Include all summary items in JSON health output

Backport: emperor, dumpling
Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-20 12:07:09 -08:00
John Spray
fdf3b5520d Fix #7187: Include all summary items in JSON health output
Signed-off-by: John Spray <john.spray@inktank.com>
2014-01-20 11:10:29 +00:00
Sage Weil
63a77f4656 Merge pull request #1112 from kazhang/wip-7180
Fix #7180 in ceph_rest_api

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-19 12:00:07 -08:00
Kai Zhang
20cf41d6ce Missing a key for perm 'w' in permmap (src/pybin/ceph_rest_api.py:277)
It leads to a 500 error when getting mds help info via rest api.
Changed "w" to "rw" in MonCommands.h

Fixes: #7180
Signed-off-by: Kai Zhang <kazhang2@cisco.com>
2014-01-18 23:58:26 -08:00
Yehuda Sadeh
26a534e62d Merge branch 'bclibcoop/next-cors' of https://github.com/BCLibCoop/ceph into next
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-18 21:48:30 -08:00
Robin H. Johnson
586ad1f69e rgw: Use correct secret key for POST authn
The POST authentication by signature validation looked up a user based
on the access key, then used the first secret key for the user. If the
access key used was not the first access key, then the expected
signature would be wrong, and the POST would be rejected.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2014-01-18 21:30:17 -08:00
Robin H. Johnson
52a915400c rgw: Fix signature variable naming/failure print
The signature variables for expected vs got are poorly named, and this
lead them being swapped in the signature validation failure print.
Change them to 'expected' and 'received' and make the related temporary
variables consistent to match.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2014-01-18 21:30:17 -08:00
Robin H. Johnson
6dcf462c51 rgw: Document fields for access/secret key
The field name mapping for access vs secret key is not clear, this
helped in debugging.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2014-01-18 21:30:17 -08:00
Sage Weil
7314cde144 osd: ignore num_objects_dirty for old pools
Way back in a0ed9c2004 we introduced the
dirty flag, but we did not track it in the stats until much later in
c561d5ea22.  Unfortunately this interval
spans the emperor release.  To avoid making scrub error out and require
repair on *any* of those old pools, flag stats that were encoded before
now such that the dirty stats are ignored.  Clear the flag if we *do*
do a repair so that it will be tracked properly thereafter.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-18 21:19:58 -08:00
Sage Weil
8ef7268a73 Merge pull request #1111 from ceph/wip-osdmap-7177
OSDMap: Populate primary_temp values a little more carefully

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-18 21:06:09 -08:00
Noah Watkins
1b308b650f libc++: fix null pointer comparison
This error is thrown when comparing a shared_ptr to NULL. To resolve
this we just use shared_ptr::operator bool that checks if the stored
pointer is null.

In C++11 the shared_ptr can be compared to nullptr, but as of yet I have
not come up with a good compatibility fix.

Details:

os/MemStore.cc:259:30: error: use of overloaded operator '!=' is ambiguous (with operand types 'ObjectRef' (aka 'shared_ptr<MemStore::Object>') and 'long')
  return (c->get_object(oid) != __null);
          ~~~~~~~~~~~~~~~~~~ ^  ~~~~~~
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/memory:4787:1: note: candidate function [with _Tp = MemStore::Object]
operator!=(const shared_ptr<_Tp>& __x, nullptr_t) throw()
^
os/MemStore.cc:259:30: note: built-in candidate operator!=(int, long)
  return (c->get_object(oid) != __null);
                             ^
os/MemStore.cc:259:30: note: built-in candidate operator!=(unsigned __int128, long)
os/MemStore.cc:259:30: note: built-in candidate operator!=(unsigned long long, long)
    .....
1 error generated.
make[3]: *** [os/MemStore.lo] Error 1

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-18 14:03:58 -08:00
Noah Watkins
1fcbddc846 libc++: avoid hash re-definitions
The definitions of hash<> for int64_t/uint64_t that were not available
on i386 in the __gnu_cxx namespace are available when we switch over to
std::tr1 namespace so we remove them to avoid the redefinition errors.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-18 14:03:58 -08:00
Noah Watkins
aae47009ba libc++: use ceph::shared_ptr in installed header
librados.hpp uses std::tr1::shared_ptr which may not be available such
as in libc++. This switches the use to ceph::shared_ptr and as a result
also ships include/memory.h for the definition.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-18 14:03:54 -08:00
Noah Watkins
4c4e1d0d47 libc++: use ceph:: namespaced data types
Switches the implemetnation of smart pointers and unordered map/set to
use the ceph:: versions.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-18 14:03:20 -08:00
Noah Watkins
8e8672047c libc++: create portable smart ptr / hash_map/set
Creates ceph:: namespaced versions of smart pointers and unordered map
and sets.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-01-18 14:03:15 -08:00
Greg Farnum
7e7eda4764 OSDMap: Populate primary_temp values a little more carefully
In _get_temp_osds(), we populate temp_pg from the list in the OSDMap,
but we also skip anybody in the list who's down. We need to account
for those skips when setting the primary. It's easy enough to do -- just
look at the output pg_temp list instead of the OSDMap's starting one.

Fixes: #7177

Signed-off-by: Greg Farnum <greg@inktank.com>
2014-01-17 21:04:30 -08:00
tamil
47bc71a7b4 fixed the syntax for test maxmds=2
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2014-01-17 15:56:36 -08:00
tamil
a13ebd370a fix for the test maxmds=2
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2014-01-17 15:41:48 -08:00
John Wilkins
ad203d5988 doc: Fixed ruleset typo.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-17 13:33:48 -08:00
Yehuda Sadeh
6a19daa2a5 Merge pull request #1106 from ceph/wip-rgw-contention
Wip rgw contention

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-17 13:17:48 -08:00
Yehuda Sadeh
6b7f27c015 librados: use rwlock for lookup pool, cache results
Use rwlock to read cahed results, only use regular lock if
results are not cached.
Invalidate cache on new osdmap.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-17 12:52:02 -08:00
Yehuda Sadeh
4b31456b81 rgw: add .h file to Makefile rule
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-17 12:34:29 -08:00
Sage Weil
7f61d2492f Merge pull request #1082 from dachary/wip-ceph-disk
ceph-disk: larger timeout in the test script

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-17 11:59:00 -08:00
Sage Weil
be5ac2b7c2 Merge pull request #1088 from christian-marie/wip-c-atomic-writes
librados: Add C API coverage for atomic write operations

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-17 11:47:26 -08:00
John Wilkins
d1de32cfb5 doc: Added default-placement to list of placement targets. Added SSL commentary.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-17 11:23:40 -08:00
John Wilkins
80212eaaf4 doc: Added additional comment about port number.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-01-17 11:22:39 -08:00
Yehuda Sadeh
184e64d073 Merge pull request #1092 from ceph/wip-rgw-loadgen
Wip rgw loadgen

Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-17 10:24:18 -08:00
Yehuda Sadeh
021534214a rgw: loadgen, configurable num of objs, buckets
also fix request draining

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-17 10:16:09 -08:00
Yehuda Sadeh
7c867645ac rgw: loadgen shutdown, error out on failures
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-17 10:14:43 -08:00
Yehuda Sadeh
85267cf6af rgw: sign loadgen requests
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-01-17 10:14:42 -08:00