]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoqa: support running under non privileged user 2052/head
Loic Dachary [Tue, 1 Jul 2014 06:42:58 +0000 (08:42 +0200)]
qa: support running under non privileged user

If the test is run against a cluster started with vstart.sh (which is
the case for make check), the --asok-does-not-need-root disables the use
of sudo and allows the test to run without requiring privileged user
permissions.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1942 from ceph/wip-fs-cmds
Gregory Farnum [Tue, 1 Jul 2014 03:52:46 +0000 (20:52 -0700)]
Merge pull request #1942 from ceph/wip-fs-cmds

Wip fs cmds

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 30 Jun 2014 23:50:01 +0000 (16:50 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #2050 from ceph/wip-cephtool
Dan Mick [Mon, 30 Jun 2014 23:48:29 +0000 (16:48 -0700)]
Merge pull request #2050 from ceph/wip-cephtool

qa/workunits/cephtool/test.sh: sudo ceph daemon

11 years agoqa/workunits/cephtool/test.sh: sudo ceph daemon 2050/head
Sage Weil [Mon, 30 Jun 2014 23:38:10 +0000 (16:38 -0700)]
qa/workunits/cephtool/test.sh: sudo ceph daemon

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2049 from ceph/wip-fix-pglog-unittest
Sage Weil [Mon, 30 Jun 2014 22:31:10 +0000 (15:31 -0700)]
Merge pull request #2049 from ceph/wip-fix-pglog-unittest

PGLog: fix clear() to avoid the IndexLog::zero() asserts

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoPGLog: fix clear() to avoid the IndexLog::zero() asserts 2049/head
Samuel Just [Mon, 30 Jun 2014 20:40:07 +0000 (13:40 -0700)]
PGLog: fix clear() to avoid the IndexLog::zero() asserts

Introduced in:
  c5b8d8105d965da852c79add607b69d5ae79a4d4
  ac11ca40b4f4525cbe9b1778b1c5d9472ecb9efa
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2003 from ferustigris/hotfix/rgw_memory_leaks
Josh Durgin [Mon, 30 Jun 2014 20:13:52 +0000 (13:13 -0700)]
Merge pull request #2003 from ferustigris/hotfix/rgw_memory_leaks

RGW memory leaks have been fixed

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #2041 from ceph/wip-map-unmap
Josh Durgin [Mon, 30 Jun 2014 20:11:46 +0000 (13:11 -0700)]
Merge pull request #2041 from ceph/wip-map-unmap

Wip map unmap

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #2040 from ceph/wip-krbd-settle
Josh Durgin [Mon, 30 Jun 2014 20:09:21 +0000 (13:09 -0700)]
Merge pull request #2040 from ceph/wip-krbd-settle

krbd: rework the unmap retry loop

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #2038 from ceph/wip-fsx-random-ctx
Josh Durgin [Mon, 30 Jun 2014 20:08:14 +0000 (13:08 -0700)]
Merge pull request #2038 from ceph/wip-fsx-random-ctx

test_librbd_fsx: use private RNG context

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #2048 from ceph/wip-8699
Josh Durgin [Mon, 30 Jun 2014 20:02:17 +0000 (13:02 -0700)]
Merge pull request #2048 from ceph/wip-8699

rgw: fix uninit ofs in RGWObjManifect::obj_iterator

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agorgw: fix uninit ofs in RGWObjManifect::obj_iterator 2048/head
Sage Weil [Mon, 30 Jun 2014 19:55:45 +0000 (12:55 -0700)]
rgw: fix uninit ofs in RGWObjManifect::obj_iterator

Valgrind picked this up:

  <kind>UninitCondition</kind>
  <what>Conditional jump or move depends on uninitialised value(s)</what>
  <stack>
    <frame>
      <ip>0x5145B8</ip>
      <obj>/usr/bin/radosgw</obj>
      <fn>RGWObjManifest::obj_iterator::seek(unsigned long)</fn>
      <dir>/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-0.82-354-g62027ec/src/rgw</dir>
      <file>rgw_rados.cc</file>
      <line>562</line>
    </frame>
    <frame>
      <ip>0x5672A4</ip>
      <obj>/usr/bin/radosgw</obj>
      <fn>list_multipart_parts(RGWRados*, req_state*, std::string const&amp;, std::string&amp;, int, int, std::map&lt;unsigned int, RGWUploadPartInfo, std::less&lt;unsigned int&gt;, std::allocator&lt;std::pair&lt;unsigned int const, RGWUploadPartInfo&gt; &gt; &gt;&amp;, int*, bool*, bool)</fn>
      <dir>/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-0.82-354-g62027ec/src/rgw</dir>
      <file>rgw_rados.h</file>
      <line>217</line>
    </frame>
    <frame>
      <ip>0x5688EE</ip>
      <obj>/usr/bin/radosgw</obj>
      <fn>RGWListMultipart::execute()</fn>
      <dir>/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-0.82-354-g62027ec/src/rgw</dir>
      <file>rgw_op.cc</file>
      <line>2956</line>
    </frame>
...

Fixes: #8699
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2045 from ceph/wip-8542
Sage Weil [Mon, 30 Jun 2014 19:35:46 +0000 (12:35 -0700)]
Merge pull request #2045 from ceph/wip-8542

qa/workunits/suites/fsx.sh: don't use zero range

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #2026 from athanatos/wip-8438-master
Samuel Just [Mon, 30 Jun 2014 18:12:03 +0000 (11:12 -0700)]
Merge pull request #2026 from athanatos/wip-8438-master

Wip 8438 master

Fixes: #8438
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2027 from athanatos/wip-7999-master
Samuel Just [Mon, 30 Jun 2014 18:11:16 +0000 (11:11 -0700)]
Merge pull request #2027 from athanatos/wip-7999-master

Wip 7999 master

Fixes: #7999
Backport: Firefly
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
11 years agoqa/workunits/suites/fsx.sh: don't use zero range 2045/head
Sage Weil [Mon, 30 Jun 2014 14:05:04 +0000 (07:05 -0700)]
qa/workunits/suites/fsx.sh: don't use zero range

Zero range is not supported by cephfs.

Fixes: #8542
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2039 from dachary/wip-erasure-code-doc
Loic Dachary [Mon, 30 Jun 2014 09:40:30 +0000 (11:40 +0200)]
Merge pull request #2039 from dachary/wip-erasure-code-doc

erasure-code: add definitions to the glossary

Reviewed-by: Florent Flament <florent.flament@cloudwatt.com>
11 years agomon/MDSMonitor: log warning while MDS up but no FS 1942/head
John Spray [Thu, 12 Jun 2014 11:54:35 +0000 (12:54 +0100)]
mon/MDSMonitor: log warning while MDS up but no FS

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agomon/MDSMonitor: fix incorrect comment
John Spray [Thu, 12 Jun 2014 11:30:35 +0000 (12:30 +0100)]
mon/MDSMonitor: fix incorrect comment

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agomon/MDSMonitor: s/enabled/get_enabled()/
John Spray [Thu, 12 Jun 2014 11:24:03 +0000 (12:24 +0100)]
mon/MDSMonitor: s/enabled/get_enabled()/

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agomds: Handle setting 'enabled' in upgrades
John Spray [Thu, 12 Jun 2014 11:22:33 +0000 (12:22 +0100)]
mds: Handle setting 'enabled' in upgrades

Previously was always defaulting to disabled,
should be enabled if MDS map epoch is >1 (i.e.
if an MDS was ever started).

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agomds: journal-related debug messages
John Spray [Mon, 9 Jun 2014 11:37:03 +0000 (12:37 +0100)]
mds: journal-related debug messages

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agotest/qa: update for MDSMonitor changes
John Spray [Tue, 27 May 2014 10:04:43 +0000 (11:04 +0100)]
test/qa: update for MDSMonitor changes

Accomodate changes:
 * data and metadata pools no longer exist by default
 * filesystem-using tests must use `fs new` to create
   the filesystem first.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agovstart: update for newfs/rmfs changes
John Spray [Fri, 23 May 2014 13:30:20 +0000 (14:30 +0100)]
vstart: update for newfs/rmfs changes

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: add `ceph fs [new|rm|ls]`
John Spray [Tue, 29 Apr 2014 19:05:11 +0000 (20:05 +0100)]
mon: add `ceph fs [new|rm|ls]`

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agoerasure-code: add definitions to the glossary 2039/head
Loic Dachary [Mon, 30 Jun 2014 08:19:23 +0000 (10:19 +0200)]
erasure-code: add definitions to the glossary

and fix a typo

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomon: hide mdsmap in 'ceph status' if not enabled
John Spray [Tue, 27 May 2014 12:22:51 +0000 (13:22 +0100)]
mon: hide mdsmap in 'ceph status' if not enabled

Previously we checked if the MDS map had ever been
updated (epoch > 1), now we have an explicit flag
for whether it's enabled.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: stop MDSMonitor when FS disabled
John Spray [Tue, 29 Apr 2014 16:18:18 +0000 (17:18 +0100)]
mon: stop MDSMonitor when FS disabled

Where 'stopped' means ignoring beacons and
not performing 'tick' activities.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: enable deleting pools when FS disabled
John Spray [Tue, 29 Apr 2014 16:17:56 +0000 (17:17 +0100)]
mon: enable deleting pools when FS disabled

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: warn in newfs if crash_replay_interval=0
John Spray [Tue, 29 Apr 2014 15:22:51 +0000 (16:22 +0100)]
mon: warn in newfs if crash_replay_interval=0

This is the setting we would apply to data pools
created automatically, so notify the user if they're
failing to use it for data pools they have created
by hand.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: don't require 'sure' flag for new fs
John Spray [Tue, 29 Apr 2014 15:01:52 +0000 (16:01 +0100)]
mon: don't require 'sure' flag for new fs

Only prompt for --yes-i-really-mean-it if there
is an existing FS.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agoosdmap: Don't create FS pools by default
John Spray [Tue, 29 Apr 2014 14:39:45 +0000 (15:39 +0100)]
osdmap: Don't create FS pools by default

Because many Ceph users don't use the filesystem,
don't create the 'data' and 'metadata' pools by
default -- they will be created by newfs if
they are needed.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomds: no initial filesystem
John Spray [Tue, 29 Apr 2014 14:14:42 +0000 (15:14 +0100)]
mds: no initial filesystem

Because not everyone uses CephFS, we would
like to avoid initially creating any data/metadata
pools for CephFS.

To avoid creating those pools, we must avoid initially
populating the MDSMap.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomds: add 'enabled' flag to MDSMap
John Spray [Tue, 29 Apr 2014 14:11:06 +0000 (15:11 +0100)]
mds: add 'enabled' flag to MDSMap

When 'enabled' is false, the MDSMap is effectively
null.  This allows Ceph clusters with no filesystem
or filesystem data/metadata pools.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agodoc: RPM instructions correction
John Spray [Wed, 21 May 2014 17:25:05 +0000 (18:25 +0100)]
doc: RPM instructions correction

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agokrbd: rework the unmap retry loop 2040/head
Ilya Dryomov [Wed, 25 Jun 2014 16:23:44 +0000 (20:23 +0400)]
krbd: rework the unmap retry loop

The retry loop in the unmap path turned out to be insufficient for
doing long fsx -K runs.  Replace it with a single retry and then call
out to 'udevadm settle' if the retry doesn't help.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years ago[RGW, memory leak] Memory leak in RGW has been fixed: deletion of allocated pointer... 2003/head
Andrey Kuznetsov [Fri, 27 Jun 2014 06:33:58 +0000 (10:33 +0400)]
[RGW, memory leak] Memory leak in RGW has been fixed: deletion of allocated pointer to pointer to Log object has been added to "on_exit" handler.

Memory leaks detector report:

$ valgrind  --leak-check=full /usr/bin/radosgw -c /etc/ceph/ceph.conf -n
client.radosgw.gateway -
...
==16986== 8 bytes in 1 blocks are definitely lost in loss record 14 of 83
==16986==    at 0x4A075BC: operator new(unsigned long) (vg_replace_malloc.c:298)
==16986==    by 0x58980B8: ceph::log::Log::set_flush_on_exit() (in /usr/lib64/librados.so.2.0.0)
==16986==    by 0x6BE3CA: global_init(std::vector<char const*, std::allocator<char const*> >*, st
==16986==    by 0x5B6B0A: main (in /usr/bin/radosgw)
...

Signed-off-by: Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
11 years ago[RGW, memory leak] Memory leak in RGW GC (losing pointer during allocating Ceph-conte...
Andrey Kuznetsov [Thu, 19 Jun 2014 13:59:31 +0000 (17:59 +0400)]
[RGW, memory leak] Memory leak in RGW GC (losing pointer during allocating Ceph-context) has been fixed.

Memory leaks detector report:
...
==117947== 11,725 (200 direct, 11,525 indirect) bytes in 25 blocks are definitely lost in loss
record 82 of 82
==117947==    at 0x4A075BC: operator new(unsigned long) (vg_replace_malloc.c:298)
==117947==    by 0x687CC1: RGWGC::process(int, int) (in /usr/bin/radosgw)
==117947==    by 0x6884D1: RGWGC::process() (in /usr/bin/radosgw)
==117947==    by 0x68875C: RGWGC::GCWorker::entry() (in /usr/bin/radosgw)
==117947==    by 0x55F890A: Thread::_entry_func(void*) (in /usr/lib64/librados.so.2.0.0)
==117947==    by 0x34D46079D0: start_thread (in /lib64/libpthread-2.12.so)
==117947==    by 0x34D42E8B6C: clone (in /lib64/libc-2.12.so)
...

Signed-off-by: Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
11 years ago[RGW, memory leaks] Memory leak in RGW initialization (Inserting new connection into...
Andrey Kuznetsov [Thu, 19 Jun 2014 13:56:01 +0000 (17:56 +0400)]
[RGW, memory leaks] Memory leak in RGW initialization (Inserting new connection into connections map w/o check) has been fixed.

Memory leaks detector report:

$ valgrind  --leak-check=full /usr/bin/radosgw -c /etc/ceph/ceph.conf -n
client.radosgw.gateway -f
...
=16986== 1,262 (48 direct, 1,214 indirect) bytes in 1 blocks are definitely lost in loss record 81
of 83
==16986==    at 0x4A075BC: operator new(unsigned long) (vg_replace_malloc.c:298)
==16986==    by 0x618F0D: RGWRados::init_complete() (in /usr/bin/radosgw)
==16986==    by 0x618FE6: RGWRados::initialize() (in /usr/bin/radosgw)
==16986==    by 0x63BB23: RGWRados::initialize(CephContext*, bool) (in /usr/bin/radosgw)
==16986==    by 0x634D20: RGWStoreManager::init_storage_provider(CephContext*, bool) (in
/usr/bin/radosgw)
==16986==    by 0x5B8970: RGWStoreManager::get_storage(CephContext*, bool) (in /usr/bin/radosgw)
==16986==    by 0x5B6D5D: main (in /usr/bin/radosgw)
...

Signed-off-by: Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
11 years agomap-unmap.sh: fail if 'rbd rm' fails 2041/head
Ilya Dryomov [Thu, 26 Jun 2014 13:34:19 +0000 (17:34 +0400)]
map-unmap.sh: fail if 'rbd rm' fails

Fail if 'rbd rm' fails - most probably it'd fail with "image still has
watchers" and in that case it's a bug in the kernel client which we do
want to notice.  Also nuke the trap-based error handling - cleanup() is
half-baked and not really necessary here.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agomap-unmap.sh: drop the get_id() logic
Ilya Dryomov [Thu, 26 Jun 2014 13:34:19 +0000 (17:34 +0400)]
map-unmap.sh: drop the get_id() logic

Take advantage of the fact that 'rbd map' will now talk to udev and
output the device that got assigned by the kernel to the newly created
mapping.  Drop the get_id() cruft, udevadm settle and chown calls.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agotest_librbd_fsx: use private RNG context 2038/head
Ilya Dryomov [Fri, 27 Jun 2014 18:43:39 +0000 (22:43 +0400)]
test_librbd_fsx: use private RNG context

It is at the core of fsx to be able to reproduce the exact op sequence
that lead to a failure.  Use reentrant glibc RNG functions to make sure
that nothing else has to chance to mess up the sequence.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge remote-tracking branch 'upstream/master' into wip-8438-master 2026/head
Samuel Just [Fri, 27 Jun 2014 20:27:47 +0000 (13:27 -0700)]
Merge remote-tracking branch 'upstream/master' into wip-8438-master

Conflicts:
src/osd/ECMsgTypes.cc

11 years agoosd/: in scrub, check for and remove obsolete rollback objs
Samuel Just [Mon, 2 Jun 2014 20:44:49 +0000 (13:44 -0700)]
osd/: in scrub, check for and remove obsolete rollback objs

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoosd/: plumb rollback_trim_to through interfaces and messages
Samuel Just [Fri, 30 May 2014 23:53:37 +0000 (16:53 -0700)]
osd/: plumb rollback_trim_to through interfaces and messages

We simply trim the roll back info up to min_last_complete_ondisk
since we cannot correctly rollback past that point anyway!

ReplicatedPG
-> PGBackend::submit_transaction
-> Backend messages
-> PGBackend::Listener::log_operation
-> append_log

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoPGLog: add rollback_info_trimmed_to_riter to IndexedLog and use in PG
Samuel Just [Fri, 30 May 2014 23:27:32 +0000 (16:27 -0700)]
PGLog: add rollback_info_trimmed_to_riter to IndexedLog and use in PG

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agodoc/release-notes: v0.82
Sage Weil [Fri, 27 Jun 2014 20:25:41 +0000 (13:25 -0700)]
doc/release-notes: v0.82

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge branch 'next'
Sage Weil [Fri, 27 Jun 2014 19:55:44 +0000 (12:55 -0700)]
Merge branch 'next'

11 years agorgw: allocate enough space for bucket instance id
Yehuda Sadeh [Mon, 16 Jun 2014 18:48:24 +0000 (11:48 -0700)]
rgw: allocate enough space for bucket instance id

Fixes: #8608
Backport: dumpling, firefly
Bucket instance id is a concatenation of zone name, rados instance id,
and a running counter. We need to allocate enough space to account zone
name length.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoPGLog: fix logging whitespace in trim
Samuel Just [Fri, 30 May 2014 22:40:15 +0000 (15:40 -0700)]
PGLog: fix logging whitespace in trim

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge remote-tracking branch 'upstream/master' into wip-7999-master 2027/head
Samuel Just [Fri, 27 Jun 2014 17:54:23 +0000 (10:54 -0700)]
Merge remote-tracking branch 'upstream/master' into wip-7999-master

Conflicts:
src/os/KeyValueStore.h

11 years agoPG: block outgoing peering messages until the last interval is durable
Samuel Just [Fri, 27 Jun 2014 17:51:13 +0000 (10:51 -0700)]
PG: block outgoing peering messages until the last interval is durable

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoPG: add machinery to temporarily buffer outgoing recovery messages
Samuel Just [Wed, 21 May 2014 20:09:33 +0000 (13:09 -0700)]
PG: add machinery to temporarily buffer outgoing recovery messages

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoos/: add async flush_commit() method to Sequencer and implementations
Samuel Just [Mon, 9 Jun 2014 18:00:32 +0000 (11:00 -0700)]
os/: add async flush_commit() method to Sequencer and implementations

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2035 from ceph/wip-da-SCA-20140623
Sage Weil [Thu, 26 Jun 2014 19:43:08 +0000 (12:43 -0700)]
Merge pull request #2035 from ceph/wip-da-SCA-20140623

Fix for SCA and CID issues

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoRevert "ceph-disk: Enable creating multiple osds per dev"
Sage Weil [Thu, 26 Jun 2014 18:37:15 +0000 (11:37 -0700)]
Revert "ceph-disk: Enable creating multiple osds per dev"

This reverts commit 200d0ae9c6e6701c06310230e180d4e739865bfe.

This breaks ceph-disk.  See #8644.  Reverting for now.

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agotest: use (unsigned)0 with gtest to avoid spurious warnings
Greg Farnum [Thu, 26 Jun 2014 17:35:00 +0000 (10:35 -0700)]
test: use (unsigned)0 with gtest to avoid spurious warnings

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2034 from ceph/wip-osd-ints
Samuel Just [Thu, 26 Jun 2014 18:05:49 +0000 (11:05 -0700)]
Merge pull request #2034 from ceph/wip-osd-ints

osd: fix int -> int32_t in misc encoded structures

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoscratchtool.c: cleanup do_rados_getxattrs() 2035/head
Danny Al-Gaaf [Thu, 26 Jun 2014 16:51:19 +0000 (18:51 +0200)]
scratchtool.c: cleanup do_rados_getxattrs()

Cleanup error path to reduce code duplication.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosd: fix pg_stat_t int -> int32_t 2034/head
Sage Weil [Thu, 26 Jun 2014 16:13:47 +0000 (09:13 -0700)]
osd: fix pg_stat_t int -> int32_t

Still 4 bytes on i386 and x86_64.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix pg_shard_t int -> int32_t
Sage Weil [Thu, 26 Jun 2014 16:13:30 +0000 (09:13 -0700)]
osd: fix pg_shard_t int -> int32_t

Still 4 bytes on i386 and x86_64.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix pg_interval_t int -> int32_t
Sage Weil [Thu, 26 Jun 2014 16:11:53 +0000 (09:11 -0700)]
osd: fix pg_interval_t int -> int32_t

Still 4 bytes on i386 and x86_64.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2032 from sponce/wip-fixstriperoni386
Sage Weil [Thu, 26 Jun 2014 15:47:06 +0000 (08:47 -0700)]
Merge pull request #2032 from sponce/wip-fixstriperoni386

Wip fixstriperoni386

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoFixed build on 32 bits platforms 2032/head
Sebastien Ponce [Thu, 26 Jun 2014 13:00:15 +0000 (15:00 +0200)]
Fixed build on 32 bits platforms

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoAdded a couple of ASSERTS for avoiding coverity to complain about the possibility...
Sebastien Ponce [Thu, 26 Jun 2014 08:37:36 +0000 (10:37 +0200)]
Added a couple of ASSERTS for avoiding coverity to complain about the possibility of a division by 0

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoMerge pull request #2030 from ceph/wip-xattr-fix
Sage Weil [Thu, 26 Jun 2014 15:33:11 +0000 (08:33 -0700)]
Merge pull request #2030 from ceph/wip-xattr-fix

mds: set xattr_version to 0 if replay doesn't contain xattrs

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agomds: set xattr_version to 0 if replay doesn't contain xattrs 2030/head
Yan, Zheng [Thu, 26 Jun 2014 05:30:13 +0000 (13:30 +0800)]
mds: set xattr_version to 0 if replay doesn't contain xattrs

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge pull request #2019 from ceph/wip-refactor-cephtool-test
Sage Weil [Thu, 26 Jun 2014 05:06:58 +0000 (22:06 -0700)]
Merge pull request #2019 from ceph/wip-refactor-cephtool-test

qa/workunits/cephtool/test.sh: refactor and make it modular (yey! \o/)

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agocommon/fd.cc: fix possible out-of-bounds write
Danny Al-Gaaf [Thu, 26 Jun 2014 03:22:02 +0000 (05:22 +0200)]
common/fd.cc: fix possible out-of-bounds write

Read max 'sizeof(target) - 1' to not write out of bound
later on the 'target[r] = 0;' call in case we read the
full PATH_MAX.

CID 1128416 (#1 of 1): Out-of-bounds write (OVERRUN)
 overrun-local: Overrunning array target of 4096 bytes
 at byte offset 4096 using index r (which evaluates to 4096).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agomount.ceph.c: fix strdup related memory leak
Danny Al-Gaaf [Thu, 26 Jun 2014 02:40:09 +0000 (04:40 +0200)]
mount.ceph.c: fix strdup related memory leak

CID 1219611 (#1 - 5): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable saw_name going out of scope
 leaks the storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoscratchtool.c: fix resource leak and error handling
Danny Al-Gaaf [Thu, 26 Jun 2014 01:49:22 +0000 (03:49 +0200)]
scratchtool.c: fix resource leak and error handling

Check the result of rados_ioctx_create()before using io_ctx.
Free io_ctx where needed. Fix messages at the end of testrados().

CID 1219613 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable io_ctx going out of scope leaks the
 storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoscratchtool.c: fix resource leak
Danny Al-Gaaf [Thu, 26 Jun 2014 00:46:30 +0000 (02:46 +0200)]
scratchtool.c: fix resource leak

CID 1219612 (#1 - 3): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable iter going out of scope leaks the
 storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoqa/workunits: cephtool: fix 'osd bench' test 2019/head
Joao Eduardo Luis [Wed, 25 Jun 2014 20:25:29 +0000 (21:25 +0100)]
qa/workunits: cephtool: fix 'osd bench' test

Commit 7dc93a9651f602d9c46311524fc6b54c2f1ac595 fixed an incorrect
behavior with the OSD's 'osd bench' value hard-caps.  The test wasn't
appropriately modified unfortunately.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: OSD: better explanation on 'max_count' calculation for 'osd bench'
Joao Eduardo Luis [Wed, 25 Jun 2014 20:20:45 +0000 (21:20 +0100)]
osd: OSD: better explanation on 'max_count' calculation for 'osd bench'

'max_count' is the maximum number of bytes that we are to allow for an
'osd bench' command.  This value is a hard-cap that takes into account
a predefined throughput, the 'osd bench' duration and, for a rather large
block size, can be taken as the amount of bytes that we would ever be
able to write in that period of time.

The explanation wasn't appropriate enough, hence this patch, which
hopefully will avoid confusion in the future.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: only run heap profiler test if tcmalloc enabled
Joao Eduardo Luis [Wed, 25 Jun 2014 00:48:24 +0000 (01:48 +0100)]
qa/workunits: cephtool: only run heap profiler test if tcmalloc enabled

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: set +e for the tcmalloc tests
Joao Eduardo Luis [Tue, 24 Jun 2014 22:16:17 +0000 (23:16 +0100)]
qa/workunits: cephtool: set +e for the tcmalloc tests

Avoids failing the tests when tcmalloc is not present

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: delete unnecessary function calls
Joao Eduardo Luis [Tue, 24 Jun 2014 21:47:31 +0000 (22:47 +0100)]
qa/workunits: cephtool: delete unnecessary function calls

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: disable bash debug when not running tests
Joao Eduardo Luis [Tue, 24 Jun 2014 21:46:44 +0000 (22:46 +0100)]
qa/workunits: cephtool: disable bash debug when not running tests

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: allow running individual tests
Joao Eduardo Luis [Tue, 24 Jun 2014 21:39:34 +0000 (22:39 +0100)]
qa/workunits: cephtool: allow running individual tests

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: cleanup state after erasure-code-profile test
Joao Eduardo Luis [Tue, 24 Jun 2014 19:55:27 +0000 (20:55 +0100)]
qa/workunits: cephtool: cleanup state after erasure-code-profile test

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: add/remove comments
Joao Eduardo Luis [Wed, 25 Jun 2014 00:17:58 +0000 (01:17 +0100)]
qa/workunits: cephtool: add/remove comments

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: split into properly indented functions
Joao Eduardo Luis [Wed, 25 Jun 2014 23:55:46 +0000 (00:55 +0100)]
qa/workunits: cephtool: split into properly indented functions

The test was a big sequence of commands being run and it has been growing
organically for a while, even though it has maintained a sense of
locality with regard to the portions being tested.

This patch intends to split the commands into functions, allowing for a
better semantic context and easier expansion.  On the other hand, this
will also allow us to implement mechanisms to run specific portions of
the test instead of always having to run the whole thing just to test a
couple of lines down at the bottom (or have to creatively edit the test).

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: move test line to where it's more appropriate
Joao Eduardo Luis [Wed, 25 Jun 2014 00:12:55 +0000 (01:12 +0100)]
qa/workunits: cephtool: move test line to where it's more appropriate

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: split into functions
Joao Eduardo Luis [Wed, 25 Jun 2014 00:11:52 +0000 (01:11 +0100)]
qa/workunits: cephtool: split into functions

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1863 from ceph/wip-rgw-manifest-iter
Josh Durgin [Wed, 25 Jun 2014 23:37:04 +0000 (16:37 -0700)]
Merge pull request #1863 from ceph/wip-rgw-manifest-iter

rgw: reduce calls to rgw_obj.set_obj()

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #2021 from ceph/wip-da-fix-make-check
Sage Weil [Wed, 25 Jun 2014 23:14:06 +0000 (16:14 -0700)]
Merge pull request #2021 from ceph/wip-da-fix-make-check

Fixes to get "make check" run on SUSE v2

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2001 from dachary/wip-tiermsg
Samuel Just [Wed, 25 Jun 2014 20:39:48 +0000 (13:39 -0700)]
Merge pull request #2001 from dachary/wip-tiermsg

mon: test that pools used in tiers cannot be removed

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1938 from dachary/wip-8071
Sage Weil [Wed, 25 Jun 2014 20:35:59 +0000 (13:35 -0700)]
Merge pull request #1938 from dachary/wip-8071

erasure-code: remove jerasure internals dependencies

11 years agoMerge pull request #2025 from ceph/wip-disable-static
Sage Weil [Wed, 25 Jun 2014 20:30:05 +0000 (13:30 -0700)]
Merge pull request #2025 from ceph/wip-disable-static

do_autogen.sh: --disable-static

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1967 from yuyuyu101/kvstore-fix-set-alloc-hint
Sage Weil [Wed, 25 Jun 2014 20:24:00 +0000 (13:24 -0700)]
Merge pull request #1967 from yuyuyu101/kvstore-fix-set-alloc-hint

Make KeyValueStore not use expected_write_size

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agotest/ceph-disk.sh: fix for SUSE 2021/head
Danny Al-Gaaf [Tue, 24 Jun 2014 17:54:17 +0000 (19:54 +0200)]
test/ceph-disk.sh: fix for SUSE

On SUSE 'which' returns always the full path of (shell) commands and
not e.g. './ceph-conf' as on Debian. Add check also for full
path returned by which.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosdmaptool/test-map-pgs.t: fix escaping to fix run
Danny Al-Gaaf [Wed, 25 Jun 2014 07:56:52 +0000 (09:56 +0200)]
osdmaptool/test-map-pgs.t: fix escaping to fix run

Run failed always running into the '|| cat $OUT' case due
to bad escaping of '\t'. This is caused by different shells
on different distros (e.g. bash on SUSE vs dash on Ubuntu).

Use 'grep -P ' and fix the regex to make it shell independet.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoRevert "Give meaningful error when submodules are not checked out"
Sage Weil [Wed, 25 Jun 2014 20:19:03 +0000 (13:19 -0700)]
Revert "Give meaningful error when submodules are not checked out"

This reverts commit 87f9dbaf78ee040bbe0f56d2ada5299b150916b2.

This breaks the gitbuilders.  Maybe it needs the base dir to be explicit?

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMake <poolname> in "ceph osd tier --help" clearer.
Accela Zhao [Wed, 18 Jun 2014 09:17:03 +0000 (17:17 +0800)]
Make <poolname> in "ceph osd tier --help" clearer.

The ceph osd tier --help info on the left always says <poolname>.
It is unclear which one to put <tierpool> on the right.

$ceph osd tier --help
osd tier add <poolname> <poolname> {--   add the tier <tierpool> to base pool
force-nonempty}                          <pool>
osd tier add-cache <poolname>            add a cache <tierpool> of size <size>
<poolname> <int[0-]>                     to existing pool <pool>
...

This patch modifies description on the right to tell which <poolname>:

osd tier add <poolname> <poolname> {--   add the tier <tierpool> (the second
 force-nonempty}                          one) to base pool <pool> (the first
                                           one)
...

Fix: http://tracker.ceph.com/issues/8256

Signed-off-by: Yilong Zhao <accelazh@gmail.com>
11 years agoMerge pull request #1978 from adamcrume/master
Sage Weil [Wed, 25 Jun 2014 18:35:16 +0000 (11:35 -0700)]
Merge pull request #1978 from adamcrume/master

OSD bug fix and developer error message

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2023 from adamcrume/wip-8661
Sage Weil [Wed, 25 Jun 2014 18:32:40 +0000 (11:32 -0700)]
Merge pull request #2023 from adamcrume/wip-8661

doc: Fix malformed parameters in librados.h

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #1958 from jdurgin/wip-rbd-ro
Sage Weil [Wed, 25 Jun 2014 18:14:58 +0000 (11:14 -0700)]
Merge pull request #1958 from jdurgin/wip-rbd-ro

qa: add script to test krbd setting ro/rw ioctl

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge branch 'wip-mon-sanity-checks'
Sage Weil [Wed, 25 Jun 2014 18:11:30 +0000 (11:11 -0700)]
Merge branch 'wip-mon-sanity-checks'

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agomon: simplify output
Sage Weil [Wed, 25 Jun 2014 18:10:32 +0000 (11:10 -0700)]
mon: simplify output

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