[Pkg-ceph-commits] [ceph] 03/03: * New upstream stable release: - d/p/firefly-post-release.patch: Dropped, no longer required.
James Downing Page
jamespage at moszumanska.debian.org
Wed Jul 30 09:06:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository ceph.
commit d19a4a66d3beda23d165519f19d69c066bca3416
Author: James Page <james.page at ubuntu.com>
Date: Wed Jul 30 09:04:40 2014 +0100
* New upstream stable release:
- d/p/firefly-post-release.patch: Dropped, no longer required.
---
debian/changelog | 7 +++
debian/patches/arch.patch | 4 +-
debian/patches/backfill-prio.patch | 66 +++++++-------------------
debian/patches/bash-completion.patch | 15 ++----
debian/patches/bug-8342.patch | 8 +---
debian/patches/bug-8624a.patch | 8 +---
debian/patches/bug-8624b.patch | 8 +---
debian/patches/bug-8821.patch | 28 +++--------
debian/patches/client-sleep1.patch | 4 +-
debian/patches/client-sleep2.patch | 8 +---
debian/patches/client-sleep3.patch | 4 +-
debian/patches/firefly-post-release.patch | 49 -------------------
debian/patches/rbdmap1-mount.patch | 17 ++-----
debian/patches/rbdmap2-hooks.patch | 8 +---
debian/patches/rbdmap3-lazyumount.patch | 5 --
debian/patches/sample.ceph.conf.patch | 65 +++++++------------------
debian/patches/series | 1 -
debian/patches/sleep-recover.patch | 4 +-
debian/patches/virtualenv-never-download.patch | 4 +-
19 files changed, 73 insertions(+), 240 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e938c89..14eaa51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (0.80.5-1) UNRELEASED; urgency=medium
+
+ * New upstream stable release:
+ - d/p/firefly-post-release.patch: Dropped, no longer required.
+
+ -- James Page <james.page at ubuntu.com> Wed, 30 Jul 2014 08:58:46 +0100
+
ceph (0.80.4-1) unstable; urgency=medium
* New upstream release [July 2014].
diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index 0e09bc5..f3d2e73 100644
--- a/debian/patches/arch.patch
+++ b/debian/patches/arch.patch
@@ -6,8 +6,7 @@ Description: use `dpkg-architecture` instead of `arch` to get build architecture
--- a/configure.ac
+++ b/configure.ac
-@@ -86,9 +86,9 @@
-
+@@ -87,7 +87,7 @@ AM_CXXFLAGS="${AM_CXXFLAGS}"
# Check for yasm
if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
echo 'we have a modern and working yasm'
@@ -16,4 +15,3 @@ Description: use `dpkg-architecture` instead of `arch` to get build architecture
echo 'we are x86_64'
AC_DEFINE([HAVE_GOOD_YASM_ELF64], [1], [we have a recent yasm and are x86_64])
with_good_yasm=yes
- fi
diff --git a/debian/patches/backfill-prio.patch b/debian/patches/backfill-prio.patch
index aaf3711..8ac72ee 100644
--- a/debian/patches/backfill-prio.patch
+++ b/debian/patches/backfill-prio.patch
@@ -11,8 +11,7 @@ Date: Tue Jun 24 02:09:49 2014
--- a/src/common/AsyncReserver.h
+++ b/src/common/AsyncReserver.h
-@@ -32,8 +32,9 @@
- template <typename T>
+@@ -33,6 +33,7 @@ template <typename T>
class AsyncReserver {
Finisher *f;
unsigned max_allowed;
@@ -20,9 +19,7 @@ Date: Tue Jun 24 02:09:49 2014
Mutex lock;
map<unsigned, list<pair<T, Context*> > > queues;
- map<T, pair<unsigned, typename list<pair<T, Context*> >::iterator > > queue_pointers;
-@@ -41,9 +42,11 @@
-
+@@ -42,7 +43,9 @@ class AsyncReserver {
void do_queues() {
typename map<unsigned, list<pair<T, Context*> > >::reverse_iterator it;
for (it = queues.rbegin();
@@ -33,9 +30,7 @@ Date: Tue Jun 24 02:09:49 2014
++it) {
while (in_progress.size() < max_allowed &&
!it->second.empty()) {
- pair<T, Context*> p = it->second.front();
-@@ -56,17 +59,27 @@
- }
+@@ -57,8 +60,12 @@ class AsyncReserver {
public:
AsyncReserver(
Finisher *f,
@@ -50,7 +45,7 @@ Date: Tue Jun 24 02:09:49 2014
void set_max(unsigned max) {
Mutex::Locker l(lock);
- max_allowed = max;
+@@ -66,6 +73,12 @@ public:
do_queues();
}
@@ -63,11 +58,9 @@ Date: Tue Jun 24 02:09:49 2014
/**
* Requests a reservation
*
- * Note, on_reserved may be called following cancel_reservation. Thus,
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
-@@ -388,8 +388,11 @@
-
+@@ -389,6 +389,9 @@ OPTION(osd_compact_leveldb_on_mount, OPT
// Maximum number of backfills to or from a single osd
OPTION(osd_max_backfills, OPT_U64, 10)
@@ -77,11 +70,9 @@ Date: Tue Jun 24 02:09:49 2014
// Refuse backfills when OSD full ratio is above this value
OPTION(osd_backfill_full_ratio, OPT_FLOAT, 0.85)
- // Seconds to wait before retrying refused backfills
--- a/src/messages/MBackfillReserve.h
+++ b/src/messages/MBackfillReserve.h
-@@ -27,10 +27,10 @@
- REQUEST = 0,
+@@ -28,8 +28,8 @@ public:
GRANT = 1,
REJECT = 2,
};
@@ -92,11 +83,9 @@ Date: Tue Jun 24 02:09:49 2014
MBackfillReserve()
: Message(MSG_OSD_BACKFILL_RESERVE, HEAD_VERSION, COMPAT_VERSION),
- query_epoch(0), type(-1), priority(-1) {}
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
-@@ -216,10 +216,12 @@
- backfill_request_timer(cct, backfill_request_lock, false),
+@@ -217,8 +217,10 @@ OSDService::OSDService(OSD *osd) :
last_tid(0),
tid_lock("OSDService::tid_lock"),
reserver_finisher(cct),
@@ -109,9 +98,7 @@ Date: Tue Jun 24 02:09:49 2014
pg_temp_lock("OSDService::pg_temp_lock"),
map_cache_lock("OSDService::map_lock"),
map_cache(cct->_conf->osd_map_cache_size),
- map_bl_cache(cct->_conf->osd_map_cache_size),
-@@ -7798,8 +7800,9 @@
- const char** OSD::get_tracked_conf_keys() const
+@@ -7806,6 +7808,7 @@ const char** OSD::get_tracked_conf_keys(
{
static const char* KEYS[] = {
"osd_max_backfills",
@@ -119,9 +106,7 @@ Date: Tue Jun 24 02:09:49 2014
"osd_op_complaint_time", "osd_op_log_threshold",
"osd_op_history_size", "osd_op_history_duration",
NULL
- };
-@@ -7812,8 +7815,12 @@
- if (changed.count("osd_max_backfills")) {
+@@ -7820,6 +7823,10 @@ void OSD::handle_conf_change(const struc
service.local_reserver.set_max(cct->_conf->osd_max_backfills);
service.remote_reserver.set_max(cct->_conf->osd_max_backfills);
}
@@ -132,11 +117,9 @@ Date: Tue Jun 24 02:09:49 2014
if (changed.count("osd_op_complaint_time") ||
changed.count("osd_op_log_threshold")) {
op_tracker.set_complaint_and_threshold(cct->_conf->osd_op_complaint_time,
- cct->_conf->osd_op_log_threshold);
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
-@@ -593,13 +593,8 @@
- return t;
+@@ -594,11 +594,6 @@ public:
}
// -- backfill_reservation --
@@ -148,11 +131,9 @@ Date: Tue Jun 24 02:09:49 2014
Finisher reserver_finisher;
AsyncReserver<spg_t> local_reserver;
AsyncReserver<spg_t> remote_reserver;
-
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
-@@ -1873,8 +1873,28 @@
-
+@@ -1874,6 +1874,26 @@ void PG::mark_clean()
dirty_info = true;
}
@@ -179,9 +160,7 @@ Date: Tue Jun 24 02:09:49 2014
void PG::finish_recovery(list<Context*>& tfin)
{
dout(10) << "finish_recovery" << dendl;
- assert(info.last_complete == info.last_update);
-@@ -5734,15 +5754,14 @@
- ConnectionRef con = pg->osd->get_con_osd_cluster(
+@@ -5735,13 +5755,12 @@ PG::RecoveryState::WaitRemoteBackfillRes
backfill_osd_it->osd, pg->get_osdmap()->get_epoch());
if (con) {
if (con->has_feature(CEPH_FEATURE_BACKFILL_RESERVATION)) {
@@ -197,9 +176,7 @@ Date: Tue Jun 24 02:09:49 2014
con.get());
} else {
post_event(RemoteBackfillReserved());
- }
-@@ -5809,10 +5828,10 @@
- pg->osd->local_reserver.request_reservation(
+@@ -5810,8 +5829,8 @@ PG::RecoveryState::WaitLocalBackfillRese
pg->info.pgid,
new QueuePeeringEvt<LocalBackfillReserved>(
pg, pg->get_osdmap()->get_epoch(),
@@ -210,9 +187,7 @@ Date: Tue Jun 24 02:09:49 2014
}
void PG::RecoveryState::WaitLocalBackfillReserved::exit()
- {
-@@ -5865,9 +5884,10 @@
- pg->osd->remote_reserver.request_reservation(
+@@ -5866,7 +5885,8 @@ PG::RecoveryState::RepWaitRecoveryReserv
pg->info.pgid,
new QueuePeeringEvt<RemoteRecoveryReserved>(
pg, pg->get_osdmap()->get_epoch(),
@@ -222,9 +197,7 @@ Date: Tue Jun 24 02:09:49 2014
}
boost::statechart::result
- PG::RecoveryState::RepWaitRecoveryReserved::react(const RemoteRecoveryReserved &evt)
-@@ -6006,9 +6026,10 @@
- pg->osd->local_reserver.request_reservation(
+@@ -6007,7 +6027,8 @@ PG::RecoveryState::WaitLocalRecoveryRese
pg->info.pgid,
new QueuePeeringEvt<LocalRecoveryReserved>(
pg, pg->get_osdmap()->get_epoch(),
@@ -234,11 +207,9 @@ Date: Tue Jun 24 02:09:49 2014
}
void PG::RecoveryState::WaitLocalRecoveryReserved::exit()
- {
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
-@@ -709,8 +709,13 @@
-
+@@ -710,6 +710,11 @@ public:
bool needs_recovery() const;
bool needs_backfill() const;
@@ -250,11 +221,9 @@ Date: Tue Jun 24 02:09:49 2014
void mark_clean(); ///< mark an active pg clean
bool _calc_past_interval_range(epoch_t *start, epoch_t *end);
- void generate_past_intervals();
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
-@@ -55,8 +55,12 @@
- #define CEPH_OSD_FEATURE_INCOMPAT_SNAPMAPPER CompatSet::Feature(10, "snapmapper")
+@@ -56,6 +56,10 @@
#define CEPH_OSD_FEATURE_INCOMPAT_SHARDS CompatSet::Feature(11, "sharded objects")
@@ -265,4 +234,3 @@ Date: Tue Jun 24 02:09:49 2014
typedef hobject_t collection_list_handle_t;
typedef uint8_t shard_id_t;
-
diff --git a/debian/patches/bash-completion.patch b/debian/patches/bash-completion.patch
index 39f3c9a..48e7585 100644
--- a/debian/patches/bash-completion.patch
+++ b/debian/patches/bash-completion.patch
@@ -6,8 +6,7 @@ Description: Improve Bash completion for various tools
--- a/src/bash_completion/ceph
+++ b/src/bash_completion/ceph
-@@ -15,8 +15,9 @@
-
+@@ -16,6 +16,7 @@ _ceph()
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
@@ -15,9 +14,7 @@ Description: Improve Bash completion for various tools
if [[ ${cur} == -* ]] ; then
COMPREPLY=( $(compgen -W "--conf -c --name --id -m --version -s --status -w --watch -o --out-file -i --in-file" -- ${cur}) )
- return 0
-@@ -31,30 +32,42 @@
- COMPREPLY=( $(compgen -A hostname ${cur}) )
+@@ -32,29 +33,41 @@ _ceph()
return 0
;;
auth)
@@ -69,8 +66,7 @@ Description: Improve Bash completion for various tools
complete -F _ceph ceph
--- a/src/bash_completion/rados
+++ b/src/bash_completion/rados
-@@ -30,9 +30,9 @@
- -m)
+@@ -31,7 +31,7 @@ _rados()
COMPREPLY=( $(compgen -A hostname ${cur}) )
return 0
;;
@@ -79,11 +75,9 @@ Description: Improve Bash completion for various tools
COMPREPLY=( $(compgen -W "lspools mkpool rmpool df ls chown get put create rm listxattr getxattr setxattr rmxattr stat mapext lssnap mksnap rmsnap rollback bench" -- ${cur}) )
return 0
;;
- esac
--- a/src/bash_completion/rbd
+++ b/src/bash_completion/rbd
-@@ -31,13 +31,17 @@
- COMPREPLY=( $(compgen -A hostname ${cur}) )
+@@ -32,11 +32,15 @@ _rbd()
return 0
;;
snap)
@@ -102,4 +96,3 @@ Description: Improve Bash completion for various tools
return 0
;;
esac
- }
diff --git a/debian/patches/bug-8342.patch b/debian/patches/bug-8342.patch
index 09ee32c..138626c 100644
--- a/debian/patches/bug-8342.patch
+++ b/debian/patches/bug-8342.patch
@@ -11,8 +11,7 @@ Description: [Fixes:#8342]
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
-@@ -338,9 +338,13 @@
- osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`
+@@ -339,7 +339,11 @@ for name in $what; do
get_conf osd_weight "" "osd crush initial weight"
defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.2f",$2/1073741824) }')"
get_conf osd_keyring "$osd_data/keyring" "keyring"
@@ -25,9 +24,7 @@ Description: [Fixes:#8342]
fi
fi
- echo Starting Ceph $name on $host...
-@@ -352,8 +356,9 @@
- [ -n "$pre_start" ] && do_cmd "$pre_start"
+@@ -353,6 +357,7 @@ for name in $what; do
do_cmd_okfail "$cmd" $runarg
if [ "$ERR" != "0" ]; then
EXIT_STATUS=$ERR
@@ -35,4 +32,3 @@ Description: [Fixes:#8342]
fi
if [ "$type" = "mon" ]; then
- # this will only work if we are using default paths
diff --git a/debian/patches/bug-8624a.patch b/debian/patches/bug-8624a.patch
index e7ba865..1295cf4 100644
--- a/debian/patches/bug-8624a.patch
+++ b/debian/patches/bug-8624a.patch
@@ -13,8 +13,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
-@@ -1067,8 +1067,16 @@
- poolid = -1;
+@@ -1068,6 +1068,14 @@ bool MDSMonitor::prepare_command(MMonCom
ss << "pool '" << poolname << "' does not exist";
}
}
@@ -29,9 +28,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
if (poolid >= 0) {
pending_mdsmap.add_data_pool(poolid);
ss << "added data pool " << poolid << " to mdsmap";
- r = 0;
-@@ -1115,8 +1123,31 @@
- << cmd_vartype_stringify(cmdmap["data"]) << "'";
+@@ -1116,6 +1124,29 @@ bool MDSMonitor::prepare_command(MMonCom
r = -EINVAL;
goto out;
}
@@ -61,4 +58,3 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
string sure;
cmd_getval(g_ceph_context, cmdmap, "sure", sure);
if (sure != "--yes-i-really-mean-it") {
- ss << "this is DANGEROUS and will wipe out the mdsmap's fs, and may clobber data in the new pools you specify. add --yes-i-really-mean-it if you do.";
diff --git a/debian/patches/bug-8624b.patch b/debian/patches/bug-8624b.patch
index 7b0969c..9fdb025 100644
--- a/debian/patches/bug-8624b.patch
+++ b/debian/patches/bug-8624b.patch
@@ -11,8 +11,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
-@@ -1130,9 +1130,12 @@
- ss << "pool id '" << data << "' does not exist";
+@@ -1131,7 +1131,10 @@ bool MDSMonitor::prepare_command(MMonCom
r = -ENOENT;
goto out;
} else if (p->is_erasure()) {
@@ -24,9 +23,7 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
r = -EINVAL;
goto out;
}
-
-@@ -1141,9 +1144,12 @@
- ss << "pool id '" << metadata << "' does not exist";
+@@ -1142,7 +1145,10 @@ bool MDSMonitor::prepare_command(MMonCom
r = -ENOENT;
goto out;
} else if (p->is_erasure()) {
@@ -38,4 +35,3 @@ Signed-off-by: Joao Eduardo Luis <joao.luis at inktank.com>
r = -EINVAL;
goto out;
}
-
diff --git a/debian/patches/bug-8821.patch b/debian/patches/bug-8821.patch
index c3c70f9..9e80569 100644
--- a/debian/patches/bug-8821.patch
+++ b/debian/patches/bug-8821.patch
@@ -30,8 +30,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
-@@ -737,10 +737,10 @@
- * affected by rbd_default_order.
+@@ -738,8 +738,8 @@ OPTION(rbd_localize_parent_reads, OPT_BO
*/
OPTION(rbd_default_format, OPT_INT, 1)
OPTION(rbd_default_order, OPT_INT, 22)
@@ -42,11 +41,9 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
OPTION(rbd_default_features, OPT_INT, 3) // 1 for layering, 3 for layering+stripingv2. only applies to format 2 images
OPTION(nss_db_path, OPT_STR, "") // path to nss db
-
--- a/src/rbd.cc
+++ b/src/rbd.cc
-@@ -2344,9 +2344,10 @@
-
+@@ -2345,7 +2345,8 @@ int main(int argc, const char **argv)
const char *poolname = NULL;
uint64_t size = 0; // in bytes
int order = 0;
@@ -56,9 +53,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
int format = 1;
uint64_t features = RBD_FEATURE_LAYERING;
const char *imgname = NULL, *snapname = NULL, *destname = NULL,
- *dest_poolname = NULL, *dest_snapname = NULL, *path = NULL,
-@@ -2358,9 +2359,9 @@
- long long stripe_unit = 0, stripe_count = 0;
+@@ -2359,7 +2360,7 @@ int main(int argc, const char **argv)
long long bench_io_size = 4096, bench_io_threads = 16, bench_bytes = 1 << 30;
string bench_pattern = "seq";
@@ -67,9 +62,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
std::ostringstream err;
long long sizell = 0;
std::vector<const char*>::iterator i;
- for (i = args.begin(); i != args.end(); ) {
-@@ -2374,15 +2375,17 @@
- return 0;
+@@ -2375,13 +2376,15 @@ int main(int argc, const char **argv)
} else if (ceph_argparse_flag(args, i, "--new-format", (char*)NULL)) {
format = 2;
format_specified = true;
@@ -88,9 +81,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
} else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) {
poolname = strdup(val.c_str());
} else if (ceph_argparse_witharg(args, i, &val, "--dest-pool", (char*)NULL)) {
- dest_poolname = strdup(val.c_str());
-@@ -2415,9 +2418,8 @@
- } else if (ceph_argparse_withlonglong(args, i, &bench_io_size, &err, "--io-size", (char*)NULL)) {
+@@ -2416,7 +2419,6 @@ int main(int argc, const char **argv)
} else if (ceph_argparse_withlonglong(args, i, &bench_io_threads, &err, "--io-threads", (char*)NULL)) {
} else if (ceph_argparse_withlonglong(args, i, &bench_bytes, &err, "--io-total", (char*)NULL)) {
} else if (ceph_argparse_witharg(args, i, &bench_pattern, &err, "--io-pattern", (char*)NULL)) {
@@ -98,9 +89,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
} else if (ceph_argparse_witharg(args, i, &val, "--path", (char*)NULL)) {
path = strdup(val.c_str());
} else if (ceph_argparse_witharg(args, i, &val, "--dest", (char*)NULL)) {
- destname = strdup(val.c_str());
-@@ -2440,11 +2442,11 @@
- progress = false;
+@@ -2441,9 +2443,9 @@ int main(int argc, const char **argv)
} else if (ceph_argparse_flag(args, i , "--allow-shrink", (char *)NULL)) {
resize_allow_shrink = true;
} else if (ceph_argparse_witharg(args, i, &val, "--format", (char *) NULL)) {
@@ -113,9 +102,7 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
format = ret;
format_specified = true;
cerr << "rbd: using --format for specifying the rbd image format is"
- << " deprecated, use --image-format instead"
-@@ -2556,8 +2558,19 @@
- break;
+@@ -2557,6 +2559,17 @@ if (!set_conf_param(v, p1, p2, p3)) { \
}
}
@@ -133,7 +120,6 @@ Subject: [PATCH 3/3] rbd: respect rbd_default_* parameters
if (format_specified && opt_cmd != OPT_IMPORT && opt_cmd != OPT_CREATE) {
cerr << "rbd: image format can only be set when "
<< "creating or importing an image" << std::endl;
- return EXIT_FAILURE;
--- /dev/null
+++ b/src/test/cli-integration/rbd/defaults.t
@@ -0,0 +1,214 @@
diff --git a/debian/patches/client-sleep1.patch b/debian/patches/client-sleep1.patch
index ed04bde..7334ee6 100644
--- a/debian/patches/client-sleep1.patch
+++ b/debian/patches/client-sleep1.patch
@@ -11,8 +11,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -3074,14 +3074,29 @@
- while (!in->caps.empty())
+@@ -3075,12 +3075,27 @@ void Client::remove_all_caps(Inode *in)
remove_cap(in->caps.begin()->second, true);
}
@@ -43,4 +42,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
}
void Client::trim_caps(MetaSession *s, int max)
- {
diff --git a/debian/patches/client-sleep2.patch b/debian/patches/client-sleep2.patch
index 4e0a260..0faea5e 100644
--- a/debian/patches/client-sleep2.patch
+++ b/debian/patches/client-sleep2.patch
@@ -10,8 +10,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -2351,8 +2351,11 @@
-
+@@ -2352,6 +2352,9 @@ void Client::put_cap_ref(Inode *in, int
int Client::get_caps(Inode *in, int need, int want, int *phave, loff_t endoff)
{
while (1) {
@@ -21,9 +20,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
if (endoff > 0 &&
(endoff >= (loff_t)in->max_size ||
endoff > (loff_t)(in->size << 1)) &&
- endoff > (loff_t)in->wanted_max_size) {
-@@ -3082,11 +3085,15 @@
- while (s->caps.size()) {
+@@ -3083,9 +3086,13 @@ void Client::remove_session_caps(MetaSes
Cap *cap = *s->caps.begin();
Inode *in = cap->inode;
int dirty_caps = 0;
@@ -38,4 +35,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
if (dirty_caps) {
lderr(cct) << "remove_session_caps still has dirty|flushing caps on " << *in << dendl;
if (in->flushing_caps)
- num_flushing_caps--;
diff --git a/debian/patches/client-sleep3.patch b/debian/patches/client-sleep3.patch
index a3f4827..8dabc7b 100644
--- a/debian/patches/client-sleep3.patch
+++ b/debian/patches/client-sleep3.patch
@@ -10,8 +10,7 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -2089,17 +2089,23 @@
- void Client::kick_requests_closed(MetaSession *session)
+@@ -2090,15 +2090,21 @@ void Client::kick_requests_closed(MetaSe
{
ldout(cct, 10) << "kick_requests_closed for mds." << session->mds_num << dendl;
for (map<ceph_tid_t, MetaRequest*>::iterator p = mds_requests.begin();
@@ -41,4 +40,3 @@ Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
}
}
assert(session->requests.empty());
- assert(session->unsafe_requests.empty());
diff --git a/debian/patches/firefly-post-release.patch b/debian/patches/firefly-post-release.patch
deleted file mode 100644
index 16f02ad..0000000
--- a/debian/patches/firefly-post-release.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Last-Update: 2014-07-17
-Forwarded: not-needed
-Origin: upstream
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: fixes from "firefly" branch since 0.80.4 release
-
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -2549,9 +2549,9 @@
-
- def main():
- args = parse_args()
-
-- loglevel = logging.INFO
-+ loglevel = logging.WARNING
- if args.verbose:
- loglevel = logging.DEBUG
-
- logging.basicConfig(
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -43,8 +43,12 @@
- . $LIBDIR/ceph_common.sh
-
- EXIT_STATUS=0
-
-+# detect systemd
-+SYSTEMD=0
-+grep -qs systemd /proc/1/comm && SYSTEMD=1
-+
- signal_daemon() {
- name=$1
- daemon=$2
- pidfile=$3
-@@ -271,9 +275,13 @@
-
- [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
- [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
-
-- cmd="$files $wrap $cmd --cluster $cluster $runmode"
-+ if [ $SYSTEMD -eq 1 ]; then
-+ cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
-+ else
-+ cmd="$files $wrap $cmd --cluster $cluster $runmode"
-+ fi
-
- if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
- get_conf pre_mount "true" "pre mount command"
- get_conf fs_type "" "osd mkfs type"
diff --git a/debian/patches/rbdmap1-mount.patch b/debian/patches/rbdmap1-mount.patch
index 38d2216..d406a15 100644
--- a/debian/patches/rbdmap1-mount.patch
+++ b/debian/patches/rbdmap1-mount.patch
@@ -27,8 +27,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
-@@ -17,9 +17,9 @@
- # Short-Description: Ceph RBD Mapping
+@@ -18,7 +18,7 @@
# Description: Ceph RBD Mapping
### END INIT INFO
@@ -37,9 +36,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
RBDMAPFILE="/etc/ceph/rbdmap"
. /lib/lsb/init-functions
-
-@@ -28,11 +28,9 @@
- log_warning_msg "$DESC : No $RBDMAPFILE found."
+@@ -29,9 +29,7 @@ do_map() {
exit 0
fi
@@ -49,9 +46,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
RET=0
while read DEV PARAMS; do
case "$DEV" in
- ""|\#*)
-@@ -43,48 +41,72 @@
- *)
+@@ -44,6 +42,10 @@ do_map() {
DEV=rbd/$DEV
;;
esac
@@ -62,7 +57,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
OIFS=$IFS
IFS=','
for PARAM in ${PARAMS[@]}; do
- CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')"
+@@ -51,39 +53,59 @@ do_map() {
done
IFS=$OIFS
if [ ! -b /dev/rbd/$DEV ]; then
@@ -144,9 +139,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
}
- case "$1" in
-@@ -113,6 +135,4 @@
- log_success_msg "Usage: rbdmap {start|stop|restart|force-reload|reload|status}"
+@@ -114,5 +136,3 @@ case "$1" in
exit 1
;;
esac
diff --git a/debian/patches/rbdmap2-hooks.patch b/debian/patches/rbdmap2-hooks.patch
index 4f94bd8..c5c7926 100644
--- a/debian/patches/rbdmap2-hooks.patch
+++ b/debian/patches/rbdmap2-hooks.patch
@@ -60,8 +60,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
-@@ -63,13 +63,19 @@
- fi
+@@ -64,11 +64,17 @@ do_map() {
log_action_end_msg ${RET_OP} "${MAP_RV}"
if [ "$newrbd" ]; then
@@ -80,9 +79,7 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
fi
done < $RBDMAPFILE
exit ${RET}
-
-@@ -79,8 +85,19 @@
- RET=0
+@@ -80,6 +86,17 @@ do_unmap() {
## Unmount and unmap all rbd devices
if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
for DEV in /dev/rbd[0-9]*; do
@@ -100,4 +97,3 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
log_action_begin_msg "RBD un-mapping: '${DEV}'"
UMNT_RV=""
UMAP_RV=""
- RET_OP=0
diff --git a/debian/patches/rbdmap3-lazyumount.patch b/debian/patches/rbdmap3-lazyumount.patch
index 7ad4ed9..f415982 100644
--- a/debian/patches/rbdmap3-lazyumount.patch
+++ b/debian/patches/rbdmap3-lazyumount.patch
@@ -27,8 +27,6 @@ Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
src/init-rbdmap | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/src/init-rbdmap b/src/init-rbdmap
-index a4e9863..70f0be8 100755
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -104,7 +104,18 @@ do_unmap() {
@@ -51,6 +49,3 @@ index a4e9863..70f0be8 100755
fi
if mountpoint -q "${MNT}"; then
## Un-mounting failed.
---
-2.0.0
-
diff --git a/debian/patches/sample.ceph.conf.patch b/debian/patches/sample.ceph.conf.patch
index 3a28a17..0e0eacd 100644
--- a/debian/patches/sample.ceph.conf.patch
+++ b/debian/patches/sample.ceph.conf.patch
@@ -12,8 +12,7 @@ Description: sample.ceph.conf update:
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
-@@ -30,9 +30,9 @@
- # $name ; Expands to $type.$id.
+@@ -31,7 +31,7 @@
# ; Example: /var/run/ceph/$cluster-$name.asok
[global]
@@ -22,9 +21,7 @@ Description: sample.ceph.conf update:
;fsid = {UUID} # use `uuidgen` to generate your own UUID
;public network = 192.168.0.0/24
- ;cluster network = 192.168.0.0/24
-@@ -50,10 +50,10 @@
- # (Default: 0)
+@@ -51,8 +51,8 @@
;max open files = 131072
@@ -35,9 +32,7 @@ Description: sample.ceph.conf update:
# If enabled, the Ceph Storage Cluster daemons (i.e., ceph-mon, ceph-osd,
# and ceph-mds) must authenticate with each other.
- # Type: String (optional); Valid settings are "cephx" or "none".
-@@ -77,23 +77,27 @@
- # the Ceph Client and the Ceph Storage Cluster, and between daemons
+@@ -78,7 +78,11 @@
# comprising the Ceph Storage Cluster.
# Type: Boolean (optional)
# (Default: false)
@@ -50,7 +45,7 @@ Description: sample.ceph.conf update:
# The path to the keyring file.
# Type: String (optional)
- # Default: /etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin
+@@ -86,13 +90,13 @@
;keyring = /etc/ceph/$cluster.$name.keyring
@@ -66,9 +61,7 @@ Description: sample.ceph.conf update:
## Replication level in degraded state, less than 'osd pool default size' value.
# Sets the minimum number of written replicas for objects in the
- # pool in order to acknowledge a write operation to the client. If
-@@ -101,9 +105,9 @@
- # client. This setting ensures a minimum number of replicas when
+@@ -102,7 +106,7 @@
# operating in degraded mode.
# Type: 32-bit Integer
# (Default: 0), which means no particular minimum. If 0, minimum is size - (size / 2).
@@ -77,9 +70,7 @@ Description: sample.ceph.conf update:
## Ensure you have a realistic number of placement groups. We recommend
## approximately 100 per OSD. E.g., total number of OSDs multiplied by 100
- ## divided by the number of replicas (i.e., osd pool default size). So for
-@@ -113,16 +117,16 @@
- # Description: The default number of placement groups for a pool. The
+@@ -114,14 +118,14 @@
# default value is the same as pg_num with mkpool.
# Type: 32-bit Integer
# (Default: 8)
@@ -96,9 +87,7 @@ Description: sample.ceph.conf update:
# The default CRUSH ruleset to use when creating a pool
# Type: 32-bit Integer
- # (Default: 0)
-@@ -134,47 +138,38 @@
- # (Default: 1) Typically a host containing one or more Ceph OSD Daemons.
+@@ -135,15 +139,22 @@
;osd crush chooseleaf type = 1
@@ -123,7 +112,7 @@ Description: sample.ceph.conf update:
# Enable if you want your daemons to bind to IPv6 address instead of
# IPv4 ones. (Not required if you specify a daemon or cluster IP.)
- # Type: Boolean
+@@ -151,29 +162,13 @@
# (Default: false)
;ms bind ipv6 = true
@@ -155,9 +144,7 @@ Description: sample.ceph.conf update:
# The IDs of initial monitors in a cluster during startup.
# If specified, Ceph requires an odd number of monitors to form an
- # initial quorum (e.g., 3).
-@@ -184,9 +179,9 @@
-
+@@ -185,7 +180,7 @@
;mon host = cephhost01,cephhost02
;mon addr = 192.168.0.101,192.168.0.102
@@ -166,9 +153,7 @@ Description: sample.ceph.conf update:
# Default: /var/lib/ceph/mon/$cluster-$id
;mon data = /var/lib/ceph/mon/$name
- # The clock drift in seconds allowed between monitors.
-@@ -196,9 +191,9 @@
-
+@@ -197,7 +192,7 @@
# Exponential backoff for clock drift warnings
# Type: Float
# (Default: 5)
@@ -177,9 +162,7 @@ Description: sample.ceph.conf update:
# The percentage of disk space used before an OSD is considered full.
# Type: Float
- # (Default: .95)
-@@ -208,10 +203,21 @@
- # Type: Float
+@@ -209,8 +204,19 @@
# (Default: .85)
;mon osd nearfull ratio = .85
@@ -200,9 +183,7 @@ Description: sample.ceph.conf update:
# logging, for debugging monitor crashes, in order of
# their likelihood of being helpful :)
- ;debug ms = 1
-@@ -238,18 +244,30 @@
- # You must deploy at least one metadata server to use CephFS. There is
+@@ -239,16 +245,28 @@
# experimental support for running multiple metadata servers. Do not run
# multiple metadata servers in production.
[mds]
@@ -233,9 +214,7 @@ Description: sample.ceph.conf update:
;[mds.alpha]
; host = alpha
-
-@@ -260,10 +278,9 @@
- ## osd
+@@ -261,8 +279,7 @@
# You need at least one. Two or more if you want data to be replicated.
# Define as many as you like.
[osd]
@@ -245,9 +224,7 @@ Description: sample.ceph.conf update:
# The path to the OSDs data.
# You must create the directory when deploying Ceph.
- # You should mount a drive for OSD data at this mount point.
-@@ -281,8 +298,12 @@
- # Type: 32-bit Integer
+@@ -282,6 +299,10 @@
# (Default: 5)
;osd recovery max active = 3
@@ -258,9 +235,7 @@ Description: sample.ceph.conf update:
# You may add settings for mkcephfs so that it will create and mount
# the file system for you. Remove the comment `#` character for
- # the following settings and replace the values in parenthesis
-@@ -302,17 +323,22 @@
- ## hundred MB should be enough; more if you have fast or many
+@@ -303,7 +324,7 @@
## disks. You can use a file under the osd data dir if need be
## (e.g. /data/$name/journal), but it will be slower than a
## separate disk or partition.
@@ -269,7 +244,7 @@ Description: sample.ceph.conf update:
# device (such as a partition of an SSD). If it is a file, you must
# create the directory to contain it.
# We recommend using a drive separate from the osd data drive.
- # Type: String
+@@ -311,7 +332,12 @@
# Default: /var/lib/ceph/osd/$cluster-$id/journal
;osd journal = /var/lib/ceph/osd/$name/journal
@@ -283,9 +258,7 @@ Description: sample.ceph.conf update:
# The size of the journal in megabytes. If this is 0,
# and the journal is a block device, the entire block device is used.
- # Since v0.54, this is ignored if the journal is a block device,
-@@ -320,30 +346,49 @@
- # Type: 32-bit Integer
+@@ -321,28 +347,47 @@
# (Default: 5120)
# Recommended: Begin with 1GB. Should be at least twice the product
# of the expected speed multiplied by "filestore max sync interval".
@@ -340,9 +313,7 @@ Description: sample.ceph.conf update:
;[osd.0]
; host = delta
-
-@@ -361,4 +406,54 @@
-
+@@ -362,3 +407,53 @@
;[osd.3]
; host = eta
; devs = /dev/sdy
diff --git a/debian/patches/series b/debian/patches/series
index 066bb62..169e8a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
## Backported / Upstream
-firefly-post-release.patch
bug-8342.patch
bug-8624a.patch
bug-8624b.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 940c3b8..23c42ce 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,8 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -9014,8 +9014,9 @@
-
+@@ -9015,6 +9015,7 @@ void Client::ms_handle_remote_reset(Conn
case MetaSession::STATE_OPEN:
ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
s->state = MetaSession::STATE_STALE;
@@ -15,4 +14,3 @@ Description: fix fuse-client hang after wake-up from suspend.
break;
case MetaSession::STATE_NEW:
- case MetaSession::STATE_CLOSED:
diff --git a/debian/patches/virtualenv-never-download.patch b/debian/patches/virtualenv-never-download.patch
index 00185b1..b95e96f 100644
--- a/debian/patches/virtualenv-never-download.patch
+++ b/debian/patches/virtualenv-never-download.patch
@@ -5,8 +5,7 @@ Forwarded: no
---
--- a/src/test/run-cli-tests
+++ b/src/test/run-cli-tests
-@@ -29,9 +29,9 @@
- # With "make distcheck", the source directory must be read-only. I
+@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
# patched cram to support that. See upstream ticket at
# https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
# -- tv at inktank.com
@@ -15,4 +14,3 @@ Forwarded: no
fi
SRCDIR_ABS="$(readlink -f "$SRCDIR")"
- BUILDDIR_ABS="$(readlink -f "$BUILDDIR")"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list