[Pkg-ceph-commits] [ceph] 03/03: New upstream release [0.79] + changelog summary
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Tue Apr 8 07:09:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch experimental
in repository ceph.
commit 5067a59 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Tue Apr 8 07:06:47 2014
New upstream release [0.79] + changelog summary
---
debian/changelog | 14 +++++
debian/copyright | 45 +++++++++++++-
debian/patches/7980.patch | 33 -----------
debian/patches/ceph-conf-no-log.patch | 103 ---------------------------------
debian/patches/fix-defaultweight.patch | 22 -------
debian/patches/init-lsb.patch | 29 ----------
debian/patches/init-osd.patch | 25 --------
debian/patches/init.patch | 61 -------------------
debian/patches/logrotate.patch | 23 --------
debian/patches/modules.patch | 17 ++++--
debian/patches/series | 7 ---
11 files changed, 69 insertions(+), 310 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2397601..28a6ab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ceph (0.79-1) experimental; urgency=low
+
+ * New upstream release [April 2014].
+ * Tighten dependency on ceph-common.
+ * Install pm-suspend handler to stop/start ceph services on suspend/resume.
+ * New (inactive) patch to bump OSD's leveldb defaults.
+ * Patches dropped (applied-upstream):
+ - init.patch
+ - logrotate.patch
+ - fix-defaultweight.patch
+ * Refreshed "modules.patch".
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Tue, 08 Apr 2014 16:52:04 +1000
+
ceph (0.78-2) experimental; urgency=low
* Standards to 3.9.5.
diff --git a/debian/copyright b/debian/copyright
index 064e3f6..7bd1be6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ Copyright: 2004-2013 Sage Weil <sage at newdream.net>
2013 eNovance SAS <licensing at enovance.com>
2012 Florian Haas, hastexo
2010 Greg Farnum <gregf at hq.newdream.net>
+ 2014 John Spray <john.spray at inktank.com
2004-2012 New Dream Network
2011 Stanislav Sedov <stas at FreeBSD.org>
2013 UnitedStack <haomai at unitedstack.com>
@@ -176,12 +177,54 @@ License: BSD-3-clause
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+Files: src/ceph/ceph-0.79/src/erasure-code/jerasure/gf-complete/*
+Copyright: 2013 James S. Plank
+ Ethan L. Miller
+ Kevin M. Greenan
+ Benjamin A. Arnold
+ John A. Burnum
+ Adam W. Disney
+ Allen C. McBride
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ - Neither the name of the University of Tennessee nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+Comment:
+ https://bitbucket.org/jimplank/gf-complete
+
Files: src/erasure-code/jerasure/cauchy.*
src/erasure-code/jerasure/galois.*
src/erasure-code/jerasure/jerasure.*
src/erasure-code/jerasure/liberation.*
src/erasure-code/jerasure/reed_sol.*
-Copyright: 2011, James S. Plank <plank at cs.utk.edu>
+ src/erasure-code/jerasure/jerasure/*
+Copyright: 2011-2013 James S. Plank <plank at cs.utk.edu>
+ 2013 Kevin Greenan
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/debian/patches/7980.patch b/debian/patches/7980.patch
deleted file mode 100644
index b691a3c..0000000
--- a/debian/patches/7980.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Last-Update: 2014-04-04
-Forwarded: not-needed
-Origin: upstream, https://github.com/ceph/ceph/commit/fb72330fb3514be690dc60598242036aa560e023
-Bug-Ceph: http://tracker.ceph.com/issues/7980
-Author: Yan, Zheng <zheng.z.yan at intel.com>
-Description: fix MDS crash (segmentation fault) on client wake-up from suspend.
-
- mds: reset connection priv after connection's session is removed
-
- Signed-off-by: Yan, Zheng <zheng.z.yan at intel.com>
-
---- a/src/mds/MDS.cc
-+++ b/src/mds/MDS.cc
-@@ -2096,8 +2096,9 @@
- if (session) {
- if (session->is_closed()) {
- dout(3) << "ms_handle_reset closing connection for session " << session->info.inst << dendl;
- messenger->mark_down(con);
-+ con->set_priv(NULL);
- sessionmap.remove_session(session);
- }
- session->put();
- } else {
-@@ -2124,8 +2125,9 @@
- if (session) {
- if (session->is_closed()) {
- dout(3) << "ms_handle_remote_reset closing connection for session " << session->info.inst << dendl;
- messenger->mark_down(con);
-+ con->set_priv(NULL);
- sessionmap.remove_session(session);
- }
- session->put();
- }
diff --git a/debian/patches/ceph-conf-no-log.patch b/debian/patches/ceph-conf-no-log.patch
deleted file mode 100644
index f9c8942..0000000
--- a/debian/patches/ceph-conf-no-log.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Last-Update: 2014-04-03
-Forwarded: not-needed
-Origin: upstream, https://github.com/ceph/ceph/commit/880e6ea3fe74dfac7b167adc15e7865787ebc987
-Bug-Ceph: http://tracker.ceph.com/issues/7849
-Reviewed-by: Josh Durgin <josh.durgin at inktank.com>
-Description: ceph-conf: don't create log files
-
---- a/src/global/global_init.cc
-+++ b/src/global/global_init.cc
-@@ -55,10 +55,12 @@
- return NULL;
- return str.c_str();
- }
-
--void global_init(std::vector < const char * > *alt_def_args, std::vector < const char* >& args,
-- uint32_t module_type, code_environment_t code_env, int flags)
-+void global_pre_init(std::vector < const char * > *alt_def_args,
-+ std::vector < const char* >& args,
-+ uint32_t module_type, code_environment_t code_env,
-+ int flags)
- {
- // You can only call global_init once.
- assert(!g_ceph_context);
- std::string conf_file_list;
-@@ -103,12 +105,19 @@
-
- // Expand metavariables. Invoke configuration observers.
- conf->apply_changes(NULL);
-
-- g_lockdep = cct->_conf->lockdep;
--
- // Now we're ready to complain about config file parse errors
- complain_about_parse_errors(cct, &parse_errors);
-+}
-+
-+void global_init(std::vector < const char * > *alt_def_args,
-+ std::vector < const char* >& args,
-+ uint32_t module_type, code_environment_t code_env, int flags)
-+{
-+ global_pre_init(alt_def_args, args, module_type, code_env, flags);
-+
-+ g_lockdep = g_ceph_context->_conf->lockdep;
-
- // signal stuff
- int siglist[] = { SIGPIPE, 0 };
- block_signals(siglist, NULL);
-@@ -130,15 +139,15 @@
- }
-
- if (g_lockdep) {
- dout(1) << "lockdep is enabled" << dendl;
-- lockdep_register_ceph_context(cct);
-+ lockdep_register_ceph_context(g_ceph_context);
- }
-- register_assert_context(cct);
-+ register_assert_context(g_ceph_context);
-
- // call all observers now. this has the side-effect of configuring
- // and opening the log file immediately.
-- conf->call_all_observers();
-+ g_conf->call_all_observers();
-
- if (code_env == CODE_ENVIRONMENT_DAEMON && !(flags & CINIT_FLAG_NO_DAEMON_ACTIONS))
- output_ceph_version();
- }
---- a/src/global/global_init.h
-+++ b/src/global/global_init.h
-@@ -29,10 +29,18 @@
- * global_init is the first initialization function that
- * daemons and utility programs need to call. It takes care of a lot of
- * initialization, including setting up g_ceph_context.
- */
--void global_init(std::vector < const char * > *alt_def_args, std::vector < const char* >& args,
-- uint32_t module_type, code_environment_t code_env, int flags);
-+void global_init(std::vector < const char * > *alt_def_args,
-+ std::vector < const char* >& args,
-+ uint32_t module_type, code_environment_t code_env, int flags);
-+
-+// just the first half; enough to get config parsed but doesn't start up the
-+// cct or log.
-+void global_pre_init(std::vector < const char * > *alt_def_args,
-+ std::vector < const char* >& args,
-+ uint32_t module_type, code_environment_t code_env,
-+ int flags);
-
- /*
- * perform all of the steps that global_init_daemonize performs just prior
- * to actually forking (via daemon(3)). return 0 if we are going to proceed
---- a/src/tools/ceph_conf.cc
-+++ b/src/tools/ceph_conf.cc
-@@ -157,10 +157,10 @@
- argv_to_vec(argc, argv, args);
- env_to_vec(args);
- vector<const char*> orig_args = args;
-
-- global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
-- CINIT_FLAG_NO_DAEMON_ACTIONS);
-+ global_pre_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
-+ CINIT_FLAG_NO_DAEMON_ACTIONS);
-
- // do not common_init_finish(); do not start threads; do not do any of thing
- // wonky things the daemon whose conf we are examining would do (like initialize
- // the admin socket).
diff --git a/debian/patches/fix-defaultweight.patch b/debian/patches/fix-defaultweight.patch
deleted file mode 100644
index 4eeae56..0000000
--- a/debian/patches/fix-defaultweight.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Last-Update: 2014-03-25
-Forwarded: https://github.com/ceph/ceph/pull/1530
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: fix bug in 'defaultweight' calculation on OSD start.
- awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }
- awk: cmd. line:1: ^ backslash not last character on line
- awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }
- awk: cmd. line:1: ^ syntax error
-
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -322,9 +322,9 @@
- # update location in crush
- get_conf osd_location_hook "$BINDIR/ceph-crush-location" "osd crush location hook"
- osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`
- get_conf osd_weight "" "osd crush initial weight"
-- defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }')"
-+ defaultweight="$(df -P -k $osd_data/. | tail -1 | awk '{ print sprintf("%.2f",$2/1073741824) }')"
- get_conf osd_keyring "$osd_data/keyring" "keyring"
- do_cmd "timeout 10 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
- fi
- fi
diff --git a/debian/patches/init-lsb.patch b/debian/patches/init-lsb.patch
deleted file mode 100644
index ac7112b..0000000
--- a/debian/patches/init-lsb.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Last-Update: 2014-04-02
-Forwarded: https://github.com/ceph/ceph/pull/1587
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: correcting rbdmap LSB header / init order:
- * Require "$remote_fs" since it guarantees /usr availability
- (rbd executable is in /usr/bin/rbd)
- * Speed-up init.d rbd mapping on machines acting as MON/OSD
- by starting rbdmap after /init.d/ceph (when possible) and
- shutting down rbd before ceph.
- * Map rbd devices before starting X (helpful when /home is mounted from rbd).
-
---- a/src/init-rbdmap
-+++ b/src/init-rbdmap
-@@ -6,10 +6,13 @@
- # description: Ceph RBD Mapping
-
- ### BEGIN INIT INFO
- # Provides: rbdmap
--# Required-Start: $network
--# Required-Stop: $network
-+# Required-Start: $network $remote_fs
-+# Required-Stop: $network $remote_fs
-+# Should-Start: ceph
-+# Should-Stop: ceph
-+# X-Start-Before: $x-display-manager
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
- # Short-Description: Ceph RBD Mapping
- # Description: Ceph RBD Mapping
diff --git a/debian/patches/init-osd.patch b/debian/patches/init-osd.patch
deleted file mode 100644
index a10b1ff..0000000
--- a/debian/patches/init-osd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Last-Update: 2014-03-29
-Forwarded: https://github.com/ceph/ceph/pull/1562
-Applied-Upstream: https://github.com/ceph/ceph/commit/44afc2332e3ff6e64d8aa8fb0d160aeb60dbcc85
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: fix OSD startup issue
- On machines with MON and OSDs (on boot) OSDs started shortly after MON startup
- but MON needs time to become oprational so OSDs fail to start due to short
- timeout because they don't have enough time to establish communication with
- cluster. This is even more likely to happen when there are other monitors down
- which is not unusual when servers are rebooting after power failure.
- Increasing timeout significantly improves chances for successful OSD start.
-
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -324,9 +324,9 @@
- osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`
- 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"
-- do_cmd "timeout 10 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
-+ do_cmd "timeout 30 $BINDIR/ceph -c $conf --name=osd.$id --keyring=$osd_keyring osd crush create-or-move -- $id ${osd_weight:-${defaultweight:-1}} $osd_location"
- fi
- fi
-
- echo Starting Ceph $name on $host...
diff --git a/debian/patches/init.patch b/debian/patches/init.patch
deleted file mode 100644
index f83b56c..0000000
--- a/debian/patches/init.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Last-Update: 2014-03-24
-Forwarded: https://github.com/ceph/ceph/pull/1531
-Applied-Upstream: https://github.com/ceph/ceph/commit/012bb5fb5bbc76e5a2c5037dc0c6558f0b1b0a45
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: init.d script(s) corrections
- * init.d-script-does-not-source-init-functions
- * init.d-script-does-not-implement-required-option
- * init.d-script-missing-lsb-description
-
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -11,8 +11,10 @@
- # Short-Description: Start Ceph distributed file system daemons at boot time
- # Description: Enable Ceph distributed file system services.
- ### END INIT INFO
-
-+. /lib/lsb/init-functions
-+
- # if we start up as ./mkcephfs, assume everything else is in the
- # current directory too.
- if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
- BINDIR=.
---- a/src/init-rbdmap
-+++ b/src/init-rbdmap
-@@ -92,8 +92,13 @@
- stop)
- do_unmap
- ;;
-
-+ restart|force-reload)
-+ $0 stop
-+ $0 start
-+ ;;
-+
- reload)
- do_map
- ;;
-
-@@ -101,9 +106,9 @@
- rbd showmapped
- ;;
-
- *)
-- log_success_msg "Usage: rbdmap {start|stop|reload|status}"
-+ log_success_msg "Usage: rbdmap {start|stop|restart|force-reload|reload|status}"
- exit 1
- ;;
- esac
-
---- a/src/init-radosgw
-+++ b/src/init-radosgw
-@@ -5,8 +5,9 @@
- # Required-Stop: $remote_fs $named $network $time
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
- # Short-Description: radosgw RESTful rados gateway
-+# Description: radosgw RESTful rados gateway
- ### END INIT INFO
-
- PATH=/sbin:/bin:/usr/bin
-
diff --git a/debian/patches/logrotate.patch b/debian/patches/logrotate.patch
deleted file mode 100644
index 851929d..0000000
--- a/debian/patches/logrotate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Last-Update: 2014-03-28
-Forwarded: https://github.com/ceph/ceph/pull/1541
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: logrotate improvement -- do not rotate empty logs
-
---- a/src/logrotate.conf
-+++ b/src/logrotate.conf
-@@ -24,5 +24,6 @@
- done
- fi
- endscript
- missingok
-+ notifempty
- }
---- a/src/rgw/logrotate.conf
-+++ b/src/rgw/logrotate.conf
-@@ -21,5 +21,6 @@
- done
- fi
- endscript
- missingok
-+ notifempty
- }
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index c803d42..76b479f 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -1,10 +1,12 @@
-Description: Mark modules as actually being modules
-Author: James Page <james.page at ubuntu.com>
+Last-Update: 2014-04-08
Forwarded: no
+Author: James Page <james.page at ubuntu.com>
+Description: Mark modules as actually being modules
--- a/src/cls/Makefile.am
+++ b/src/cls/Makefile.am
-@@ -45,7 +45,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
+@@ -44,9 +44,9 @@
+ radoslib_LTLIBRARIES += libcls_replica_log.la
libcls_user_la_SOURCES = cls/user/cls_user.cc
libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -13,14 +15,17 @@ Forwarded: no
radoslib_LTLIBRARIES += libcls_user.la
libcls_rgw_la_SOURCES = \
+ cls/rgw/cls_rgw.cc \
--- a/src/erasure-code/jerasure/Makefile.am
+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -20,7 +20,7 @@ noinst_HEADERS += \
+@@ -101,9 +101,9 @@
+ erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
libec_jerasure_la_CFLAGS = ${AM_CFLAGS}
- libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
+-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
+libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
if LINUX
libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 3e75fc1..1b95214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,4 @@
-7980.patch
-ceph-conf-no-log.patch
#defaults-leveldb-osd.patch
-fix-defaultweight.patch
gcj.patch
-init-osd.patch
-init.patch
-init-lsb.patch
-logrotate.patch
modules.patch
virtualenv-never-download.patch
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list