[Pkg-ceph-commits] [ceph] 05/10: Merge tag 'upstream/0.78' into experimental
James Downing Page
jamespage at moszumanska.debian.org
Mon Mar 24 09:31:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit e5487f28c00501042eb8ab815225c872f921d4de
Merge: 3357797 3b8df30
Author: James Page <jamespage at debian.org>
Date: Sat Mar 22 18:27:39 2014 +0000
Merge tag 'upstream/0.78' into experimental
Upstream version 0.78
README | 8 +-
ceph.spec | 16 +-
ceph.spec.in | 14 +-
configure | 144 +-
configure.ac | 52 +-
src/.git_version | 4 +-
src/Makefile-env.am | 1 +
src/Makefile.am | 5 +-
src/Makefile.in | 3134 +++---
src/acconfig.h.in | 3 +
src/auth/cephx/CephxSessionHandler.cc | 17 +-
src/brag/Makefile.am | 3 +
src/brag/README.md | 184 +
src/brag/client/ceph-brag | 349 +
src/brag/server/MANIFEST.in | 1 +
src/brag/server/app.wsgi | 5 +
src/brag/server/ceph_brag.egg-info/PKG-INFO | 10 +
src/brag/server/ceph_brag.egg-info/SOURCES.txt | 21 +
.../server/ceph_brag.egg-info/dependency_links.txt | 1 +
src/brag/server/ceph_brag.egg-info/not-zip-safe | 1 +
src/brag/server/ceph_brag.egg-info/requires.txt | 1 +
src/brag/server/ceph_brag.egg-info/top_level.txt | 1 +
src/brag/server/ceph_brag/__init__.py | 0
src/brag/server/ceph_brag/app.py | 19 +
src/brag/server/ceph_brag/controllers/__init__.py | 0
src/brag/server/ceph_brag/controllers/root.py | 73 +
src/brag/server/ceph_brag/json.py | 114 +
src/brag/server/ceph_brag/model/__init__.py | 29 +
src/brag/server/ceph_brag/model/db.py | 282 +
src/brag/server/ceph_brag/tests/__init__.py | 22 +
src/brag/server/ceph_brag/tests/config.py | 54 +
src/brag/server/ceph_brag/tests/test_functional.py | 68 +
src/brag/server/ceph_brag/tests/test_units.py | 7 +
src/brag/server/config.py | 52 +
src/brag/server/sample.json | 98 +
src/brag/server/setup.cfg | 6 +
src/brag/server/setup.py | 22 +
src/ceph-disk | 96 +-
src/ceph.in | 7 +
src/ceph_mon.cc | 45 +-
src/client/Client.cc | 858 +-
src/client/Client.h | 113 +-
src/client/Dentry.h | 10 +-
src/client/Fh.h | 2 +-
src/client/Inode.cc | 6 +-
src/client/Inode.h | 14 +-
src/client/SyntheticClient.cc | 150 +-
src/client/fuse_ll.cc | 200 +-
src/cls/rgw/cls_rgw.cc | 25 +-
src/cls/rgw/cls_rgw_client.cc | 3 +-
src/cls/rgw/cls_rgw_client.h | 2 +-
src/cls/rgw/cls_rgw_ops.cc | 1 +
src/cls/rgw/cls_rgw_ops.h | 11 +-
src/cls/user/cls_user.cc | 24 +-
src/common/Makefile.am | 3 +
src/common/PrioritizedQueue.h | 4 +
src/common/Throttle.cc | 67 +-
src/common/TrackedOp.cc | 22 +-
src/common/TrackedOp.h | 8 +-
src/common/admin_socket.cc | 5 +
src/common/buffer.cc | 6 +-
src/common/ceph_argparse.cc | 42 +-
src/common/ceph_context.cc | 2 +
src/common/ceph_strings.cc | 4 +
src/common/config.cc | 6 +-
src/common/config.h | 2 +
src/common/config_opts.h | 59 +-
src/common/histogram.cc | 58 +
src/{include => common}/histogram.h | 67 +-
src/common/hobject.cc | 3 +-
src/common/hobject.h | 6 +-
src/common/obj_bencher.cc | 3 +-
src/common/shared_cache.hpp | 22 +-
src/common/str_map.cc | 2 +-
src/crush/CrushCompiler.cc | 15 +
src/crush/CrushWrapper.cc | 151 +-
src/crush/CrushWrapper.h | 47 +-
src/crush/builder.c | 1 +
src/crush/crush.h | 7 +
src/crush/grammar.h | 4 +
src/crush/mapper.c | 35 +-
src/{osd => erasure-code}/ErasureCodeInterface.h | 20 +
src/{osd => erasure-code}/ErasureCodePlugin.cc | 0
src/{osd => erasure-code}/ErasureCodePlugin.h | 0
src/erasure-code/Makefile.am | 17 +
.../jerasure}/ErasureCodeJerasure.cc | 40 +-
.../jerasure}/ErasureCodeJerasure.h | 12 +-
.../jerasure}/ErasureCodePluginJerasure.cc | 2 +-
src/erasure-code/jerasure/Makefile.am | 28 +
.../jerasure}/cauchy.c | 0
.../jerasure}/cauchy.h | 0
.../jerasure}/galois.c | 0
.../jerasure}/galois.h | 0
.../jerasure}/jerasure.c | 0
.../jerasure}/jerasure.h | 0
.../jerasure}/liberation.c | 0
.../jerasure}/liberation.h | 0
.../jerasure}/reed_sol.c | 0
.../jerasure}/reed_sol.h | 0
.../jerasure}/vectorop.h | 0
src/global/global_init.cc | 17 +-
src/global/global_init.h | 12 +-
src/include/Makefile.am | 1 -
src/include/buffer.h | 1 +
src/include/ceph_features.h | 5 +
src/include/ceph_fs.h | 13 +-
src/include/cephfs/libcephfs.h | 184 +-
src/include/cmp.h | 72 +-
src/include/encoding.h | 6 +
src/include/rados.h | 12 +-
src/include/rados/buffer.h | 1 +
src/include/rados/librados.h | 494 +-
src/include/rados/librados.hpp | 35 +-
src/init-ceph.in | 15 +-
src/libcephfs.cc | 323 +-
src/librados/IoCtxImpl.cc | 22 +-
src/librados/IoCtxImpl.h | 8 +-
src/librados/RadosClient.cc | 81 +-
src/librados/RadosClient.h | 4 +-
src/librados/librados.cc | 472 +-
src/librbd/AioRequest.cc | 8 +-
src/librbd/AioRequest.h | 5 +-
src/logrotate.conf | 18 +-
src/mds/CDir.cc | 45 +-
src/mds/CDir.h | 14 +-
src/mds/CInode.cc | 179 +-
src/mds/CInode.h | 22 +-
src/mds/Dumper.cc | 3 +-
src/mds/Locker.cc | 174 +-
src/mds/Locker.h | 6 +-
src/mds/MDBalancer.cc | 3 +-
src/mds/MDCache.cc | 849 +-
src/mds/MDCache.h | 35 +-
src/mds/MDS.cc | 45 +-
src/mds/MDS.h | 2 +-
src/mds/Migrator.cc | 297 +-
src/mds/Migrator.h | 55 +-
src/mds/Mutation.h | 8 +
src/mds/Resetter.cc | 3 +-
src/mds/ScatterLock.h | 23 +
src/mds/Server.cc | 162 +-
src/mds/Server.h | 3 +-
src/mds/SimpleLock.h | 9 +-
src/mds/events/EFragment.h | 4 +-
src/mds/events/EMetaBlob.h | 16 +-
src/mds/flock.cc | 16 +-
src/mds/flock.h | 22 +-
src/mds/journal.cc | 32 +-
src/mds/mdstypes.cc | 8 +-
src/mds/mdstypes.h | 4 +-
src/messages/MBackfillReserve.h | 16 +-
src/messages/MClientRequest.h | 2 +-
src/messages/MExportDirPrepAck.h | 10 +-
src/messages/MMDSCacheRejoin.h | 7 +-
src/messages/MMDSFragmentNotify.h | 4 +-
src/messages/MMDSSlaveRequest.h | 12 +-
src/messages/{MOSDPGPull.h => MOSDECSubOpRead.h} | 45 +-
.../{MOSDPGPull.h => MOSDECSubOpReadReply.h} | 45 +-
src/messages/{MOSDPGPull.h => MOSDECSubOpWrite.h} | 53 +-
.../{MOSDPGPull.h => MOSDECSubOpWriteReply.h} | 45 +-
src/messages/MOSDOp.h | 5 +
src/messages/MOSDOpReply.h | 9 +-
src/messages/MOSDPGBackfill.h | 16 +-
src/messages/MOSDPGInfo.h | 20 +-
src/messages/MOSDPGLog.h | 28 +-
src/messages/MOSDPGNotify.h | 20 +-
src/messages/MOSDPGPull.h | 18 +-
src/messages/MOSDPGPush.h | 18 +-
src/messages/MOSDPGPushReply.h | 19 +-
src/messages/MOSDPGQuery.h | 39 +-
src/messages/MOSDPGRemove.h | 42 +-
src/messages/MOSDPGScan.h | 31 +-
src/messages/MOSDPGTrim.h | 19 +-
src/messages/MOSDRepScrub.h | 19 +-
src/messages/MOSDSubOp.h | 27 +-
src/messages/MOSDSubOpReply.h | 31 +-
src/messages/MRecoveryReserve.h | 15 +-
src/messages/Makefile.am | 4 +
src/mon/Elector.cc | 5 +-
src/mon/MDSMonitor.cc | 62 +-
src/mon/Makefile.am | 2 +-
src/mon/MonClient.cc | 57 +-
src/mon/MonClient.h | 50 +-
src/mon/MonCommands.h | 37 +-
src/mon/Monitor.cc | 85 +-
src/mon/Monitor.h | 9 +-
src/mon/OSDMonitor.cc | 866 +-
src/mon/OSDMonitor.h | 26 +-
src/mon/PGMap.cc | 21 +-
src/mon/PGMap.h | 8 +
src/mon/PGMonitor.cc | 102 +-
src/mon/PGMonitor.h | 2 +-
src/msg/Accepter.cc | 2 +-
src/msg/Message.cc | 17 +
src/msg/Message.h | 8 +
src/msg/Pipe.cc | 6 +-
src/msg/SimpleMessenger.cc | 5 +-
src/os/DBObjectMap.cc | 11 +-
src/os/FileJournal.cc | 12 +-
src/os/FileJournal.h | 2 +-
src/os/FileStore.cc | 97 +-
src/os/FileStore.h | 34 +-
src/os/GenericFileStoreBackend.h | 1 +
src/os/GenericObjectMap.cc | 51 +-
src/os/GenericObjectMap.h | 36 +-
src/os/Journal.h | 2 +-
src/os/JournalingObjectStore.cc | 4 +-
src/os/KeyValueStore.cc | 833 +-
src/os/KeyValueStore.h | 91 +-
src/os/LFNIndex.cc | 12 +-
src/os/Makefile.am | 5 +
src/os/MemStore.cc | 4 +
src/os/ObjectStore.cc | 30 +-
src/os/ObjectStore.h | 55 +-
src/os/XfsFileStoreBackend.cc | 124 +
src/os/XfsFileStoreBackend.h | 33 +
src/osd/ECBackend.cc | 1765 ++++
src/osd/ECBackend.h | 476 +
src/osd/ECMsgTypes.cc | 333 +
src/osd/ECMsgTypes.h | 108 +
src/osd/ECTransaction.cc | 283 +
src/osd/ECTransaction.h | 207 +
src/osd/ECUtil.cc | 196 +
src/osd/ECUtil.h | 154 +
src/osd/ErasureCodePluginJerasure/Makefile.am | 28 -
src/osd/HitSet.h | 2 +
src/osd/Makefile.am | 20 +-
src/osd/OSD.cc | 923 +-
src/osd/OSD.h | 328 +-
src/osd/OSDMap.cc | 219 +-
src/osd/OSDMap.h | 70 +-
src/osd/PG.cc | 1817 ++--
src/osd/PG.h | 518 +-
src/osd/PGBackend.cc | 498 +
src/osd/PGBackend.h | 291 +-
src/osd/PGLog.cc | 388 +-
src/osd/PGLog.h | 96 +-
src/osd/ReplicatedBackend.cc | 572 +-
src/osd/ReplicatedBackend.h | 211 +-
src/osd/ReplicatedPG.cc | 2231 ++--
src/osd/ReplicatedPG.h | 261 +-
src/osd/SnapMapper.cc | 4 +-
src/osd/SnapMapper.h | 28 +-
src/osd/TierAgentState.h | 112 +
src/osd/osd_types.cc | 328 +-
src/osd/osd_types.h | 283 +-
src/osdc/ObjectCacher.cc | 27 +-
src/osdc/ObjectCacher.h | 6 +-
src/osdc/Objecter.cc | 287 +-
src/osdc/Objecter.h | 118 +-
src/pybind/rbd.py | 6 +-
src/rbd_fuse/rbd-fuse.c | 34 +-
src/rgw/logrotate.conf | 15 +-
src/rgw/rgw_admin.cc | 12 +-
src/rgw/rgw_common.cc | 3 +-
src/rgw/rgw_common.h | 5 +
src/rgw/rgw_dencoder.cc | 10 -
src/rgw/rgw_gc.cc | 6 +-
src/rgw/rgw_gc.h | 2 +-
src/rgw/rgw_json_enc.cc | 15 +
src/rgw/rgw_log.cc | 3 +
src/rgw/rgw_multi.cc | 3 +-
src/rgw/rgw_op.cc | 77 +-
src/rgw/rgw_op.h | 8 +-
src/rgw/rgw_rados.cc | 637 +-
src/rgw/rgw_rados.h | 370 +-
src/rgw/rgw_rest_swift.cc | 104 +-
src/rgw/rgw_swift.cc | 5 +-
src/test/Makefile.am | 331 +-
src/test/admin_socket.cc | 32 +
src/test/bufferlist.cc | 2 +-
src/test/ceph_argparse.cc | 109 +
src/test/cli/crushtool/help.t | 2 +
src/test/cli/crushtool/test-map-firefly-tunables.t | 10259 +++++++++++++++++++
src/test/cli/crushtool/test-map-vary-r-0.t | 3081 ++++++
src/test/cli/crushtool/test-map-vary-r-1.t | 3078 ++++++
src/test/cli/crushtool/test-map-vary-r-2.t | 3078 ++++++
src/test/cli/crushtool/test-map-vary-r-3.t | 3078 ++++++
src/test/cli/crushtool/test-map-vary-r-4.t | 3078 ++++++
src/test/cli/crushtool/test-map-vary-r.crushmap | Bin 0 -> 3892 bytes
src/test/cli/osdmaptool/clobber.t | 12 +-
src/test/cli/osdmaptool/create-print.t | 12 +-
src/test/cli/osdmaptool/create-racks.t | 12 +-
src/test/cli/osdmaptool/crush.t | 10 +
src/test/cli/osdmaptool/help.t | 4 +
.../osdmaptool/{simple.t => missing-argument.t} | 4 +
src/test/cli/osdmaptool/pool.t | 54 +
src/test/cli/osdmaptool/test-map-pgs.t | 52 +
src/test/cli/radosgw-admin/help.t | 3 +-
src/test/cls_rgw/test_cls_rgw.cc | 12 +-
src/test/common/histogram.cc | 126 +
src/test/common/test_context.cc | 64 +
src/test/crush/TestCrushWrapper.cc | 158 +-
src/test/encoding/types.h | 11 +-
.../{osd => erasure-code}/ErasureCodeExample.h | 12 +-
.../ErasureCodePluginExample.cc | 2 +-
.../ErasureCodePluginFailToInitialize.cc | 2 +-
.../ErasureCodePluginFailToRegister.cc | 2 +-
.../ErasureCodePluginHangs.cc | 2 +-
.../ErasureCodePluginMissingEntryPoint.cc | 0
src/test/erasure-code/Makefile.am | 89 +
.../TestErasureCodeExample.cc | 32 +
.../TestErasureCodeJerasure.cc | 87 +-
.../{osd => erasure-code}/TestErasureCodePlugin.cc | 2 +-
.../TestErasureCodePluginJerasure.cc | 2 +-
src/test/erasure-code/ceph_erasure_code.cc | 166 +
.../ceph_erasure_code_benchmark.cc | 8 +-
.../ceph_erasure_code_benchmark.h | 2 +-
src/test/libcephfs/test.cc | 39 +
src/test/librados/TestCase.cc | 93 +
src/test/librados/TestCase.h | 56 +
src/test/librados/aio.cc | 4 +-
src/test/librados/c_read_operations.cc | 539 +
src/test/librados/c_write_operations.cc | 41 +-
src/test/librados/cmd.cc | 31 +-
src/test/librados/io.cc | 308 +-
src/test/librados/list.cc | 161 +-
src/test/librados/lock.cc | 148 +-
src/test/librados/misc.cc | 182 +-
src/test/librados/snapshots.cc | 195 +-
src/test/librados/stat.cc | 74 +-
src/test/librados/test.cc | 66 +-
src/test/librados/test.h | 1 +
src/test/librados/tier.cc | 735 +-
src/test/librados/watch_notify.cc | 38 +-
src/test/mon/PGMap.cc | 96 +
src/test/mon/mon-test-helpers.sh | 82 +
src/test/mon/test_mon_workloadgen.cc | 2 +-
.../DeterministicOpSequence.cc | 6 +-
.../DeterministicOpSequence.h | 8 +-
.../{filestore => objectstore}/FileStoreDiff.cc | 0
.../{filestore => objectstore}/FileStoreDiff.h | 0
.../{filestore => objectstore}/FileStoreTracker.cc | 0
.../{filestore => objectstore}/FileStoreTracker.h | 0
.../TestObjectStoreState.cc} | 44 +-
.../TestObjectStoreState.h} | 18 +-
src/test/{filestore => objectstore}/chain_xattr.cc | 0
src/test/{filestore => objectstore}/store_test.cc | 214 +-
.../{filestore => objectstore}/test_idempotent.cc | 0
.../test_idempotent_sequence.cc | 0
.../workload_generator.cc | 18 +-
.../workload_generator.h | 12 +-
src/test/osd/Object.cc | 8 +-
src/test/osd/Object.h | 25 +-
src/test/osd/RadosModel.h | 65 +-
src/test/osd/TestECBackend.cc | 60 +
src/test/osd/TestOSDMap.cc | 109 +
src/test/osd/TestPGLog.cc | 599 +-
src/test/osd/TestRados.cc | 2 +-
src/test/osd/osd-test-helpers.sh | 53 +
src/test/{test_osd_types.cc => osd/types.cc} | 159 +-
src/test/rgw/test_rgw_manifest.cc | 227 +
src/test/system/rados_watch_notify.cc | 8 +-
src/test/system/st_rados_watch.cc | 12 +-
src/test/system/st_rados_watch.h | 2 +
src/test/test_crushwrapper.cc | 107 -
src/test/test_snap_mapper.cc | 3 +-
src/tools/ceph-filestore-dump.cc | 41 +-
src/tools/ceph-filestore-tool.cc | 4 +-
src/tools/crushtool.cc | 10 +
src/tools/osdmaptool.cc | 148 +-
src/tools/psim.cc | 23 +-
src/tools/rados/rados.cc | 54 +-
src/tools/rados/rados_sync.cc | 2 +-
src/tools/rados/rados_sync.h | 2 +-
src/upstart/rbdmap.conf | 2 +-
src/vstart.sh | 2 +
367 files changed, 51544 insertions(+), 9399 deletions(-)
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list