[Pkg-ceph-commits] [ceph] 03/06: New upstream point release, in preparation for Ceph Jewel.

Wed Mar 23 13:56:47 UTC 2016

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 7d29bff09a33fbcf1967997d43ca3b14d85988f6
Author: James Page <james.page at ubuntu.com>
Date:   Tue Mar 22 11:05:05 2016 +0000

    New upstream point release, in preparation for Ceph Jewel.
    
    d/p/*: Refresh patches
---
 debian/changelog                             |  7 +++++++
 debian/patches/ceph-osd-prestart-path.patch  | 22 ----------------------
 debian/patches/fix-argparse-defaults.patch   |  8 ++++----
 debian/patches/fix-systemd-escaping.patch    |  8 ++++----
 debian/patches/series                        |  2 --
 debian/patches/sleep-recover.patch           |  2 +-
 debian/patches/tests-disable-ceph-disk.patch | 16 ----------------
 debian/patches/tests-disable.patch           | 10 +++++-----
 8 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2f295d..a4ab31e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (10.0.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream point release, in preparation for Ceph Jewel.
+    - d/p/*: Refresh patches
+
+ -- James Page <james.page at ubuntu.com>  Tue, 22 Mar 2016 11:04:02 +0000
+
 ceph (10.0.3-0ubuntu1) xenial; urgency=medium
 
   * New upstream point release, in preparation for Ceph Jewel.
diff --git a/debian/patches/ceph-osd-prestart-path.patch b/debian/patches/ceph-osd-prestart-path.patch
deleted file mode 100644
index 91609ad..0000000
--- a/debian/patches/ceph-osd-prestart-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/upstart/ceph-osd.conf
-+++ b/src/upstart/ceph-osd.conf
-@@ -15,7 +15,7 @@ pre-start script
- 
-     install -d -m0770 -o ceph -g ceph /var/run/ceph
- 
--    /usr/libexec/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id"
-+    /usr/lib/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id"
- end script
- 
- instance ${cluster:-ceph}/$id
---- a/systemd/ceph-osd at .service
-+++ b/systemd/ceph-osd at .service
-@@ -10,7 +10,7 @@ LimitNPROC=1048576
- EnvironmentFile=-/etc/sysconfig/ceph
- Environment=CLUSTER=ceph
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
--ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
-+ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
- ExecReload=/bin/kill -HUP $MAINPID
- 
- [Install]
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 1dfb2e5..d664219 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -6,13 +6,13 @@ Description: Fix argparse usage for Python 2.7.9
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1413321
 Forwarded: no
 
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -3618,6 +3618,7 @@ def parse_args(argv):
+--- a/src/ceph-disk/ceph_disk/main.py
++++ b/src/ceph-disk/ceph_disk/main.py
+@@ -4168,6 +4168,7 @@ def parse_args(argv):
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
 +        cluster='ceph',
-         )
+     )
  
      subparsers = parser.add_subparsers(
diff --git a/debian/patches/fix-systemd-escaping.patch b/debian/patches/fix-systemd-escaping.patch
index 01b197b..6ad5f01 100644
--- a/debian/patches/fix-systemd-escaping.patch
+++ b/debian/patches/fix-systemd-escaping.patch
@@ -3,14 +3,14 @@ Author: James Page <james.page at ubuntu.com>
 Bug: http://tracker.ceph.com/issues/14706
 Forwarded: https://github.com/ceph/ceph/pull/7579
 
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -3380,7 +3380,7 @@ def main_trigger(args):
+--- a/src/ceph-disk/ceph_disk/main.py
++++ b/src/ceph-disk/ceph_disk/main.py
+@@ -3854,7 +3854,7 @@ def main_trigger(args):
      LOG.debug("main_trigger: " + str(args))
      if is_systemd() and not args.sync:
          # http://www.freedesktop.org/software/systemd/man/systemd-escape.html
 -        escaped_dev = args.dev.replace('-', '\\x2d')
 +        escaped_dev = args.dev[1:].replace('-', '\\x2d')
-         service='ceph-disk@{dev}.service'.format(dev=escaped_dev)
+         service = 'ceph-disk@{dev}.service'.format(dev=escaped_dev)
          LOG.info('systemd detected, triggering %s' % service)
          command(
diff --git a/debian/patches/series b/debian/patches/series
index d9d6691..f6e1eb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,11 +9,9 @@ sample.ceph.conf.patch
 # use_system_jerasure.patch
 virtualenv-never-download.patch
 # Testing patches
-tests-disable-ceph-disk.patch
 tests-disable.patch
 
 ## From Ubuntu
-ceph-osd-prestart-path.patch
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
 pybind-flags.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index c765239..66565cf 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,7 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
 
 --- a/src/client/Client.cc
 +++ b/src/client/Client.cc
-@@ -11829,6 +11829,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11800,6 +11800,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;
diff --git a/debian/patches/tests-disable-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
deleted file mode 100644
index d4a1d3f..0000000
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Last-Update: 2014-10-31
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail...
-
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -91,8 +91,6 @@ check_SCRIPTS += \
- 	test/libradosstriper/rados-striper.sh \
- 	test/test_objectstore_memstore.sh
- 
--check_SCRIPTS += test/ceph-disk.sh
--
- EXTRA_DIST += \
- 	$(srcdir)/test/python/ceph-disk/setup.py \
- 	$(srcdir)/test/python/ceph-disk/tox.ini \
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index bc05314..c14197e 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,17 +13,17 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -90,6 +91,7 @@ check_SCRIPTS += \
- 	test/mon/mon-handle-forward.sh \
+@@ -92,6 +93,7 @@ check_SCRIPTS += \
  	test/libradosstriper/rados-striper.sh \
- 	test/test_objectstore_memstore.sh
+ 	test/test_objectstore_memstore.sh \
+         test/test_pidfile.sh
 +endif
  
  EXTRA_DIST += \
- 	$(srcdir)/test/python/ceph-disk/setup.py \
+ 	$(srcdir)/test/python/brag-client/setup.py \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1389,6 +1389,13 @@ AC_LANG_POP([C++])
+@@ -1316,6 +1316,13 @@ AC_LANG_POP([C++])
  
  AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git

