diff -Nru cinder-2013.2.100+git201407161406~saucy/ChangeLog cinder-2013.2.100+git201407161842~saucy/ChangeLog --- cinder-2013.2.100+git201407161406~saucy/ChangeLog 2014-07-16 18:07:12.000000000 +0000 +++ cinder-2013.2.100+git201407161842~saucy/ChangeLog 2014-07-16 22:43:16.000000000 +0000 @@ -1,3 +1,10 @@ +commit f73d7b685ca3331c76c521531a137461288fa3eb +Merge: da778ee 0b2041f +Author: Jenkins +Date: Wed Jul 16 22:05:09 2014 +0000 + + Merge "Change RBD delete failure log level to warn" into stable/havana + commit da778ee08d1a1bc9cd6a33a645c577eb162cd7f8 Merge: 571c765 8e01982 Author: Jenkins @@ -217,6 +224,19 @@ Merge "Cast the quota set values to integer before checking their validity" into stable/havana +commit 0b2041fb68cc845f0adb270304352045de6c3754 +Author: Mike Perez +Date: Fri Feb 28 11:09:27 2014 -0800 + + Change RBD delete failure log level to warn + + This is a recoverable issue in the backend, so we don't have to provide + the message on the error level. + + Change-Id: I35711876b2c088ad28f32abd39248dc9a467d00d + Closes-Bug: #1256259 + (cherry picked from commit a2f2a0e0d2f9516d86ef5988e083f70804c3977c) + commit 53efa1e02b62e3466aff8826f0bd6a8e48988c01 Merge: 0123feb e8aeb57 Author: Jenkins diff -Nru cinder-2013.2.100+git201407161406~saucy/cinder/volume/drivers/rbd.py cinder-2013.2.100+git201407161842~saucy/cinder/volume/drivers/rbd.py --- cinder-2013.2.100+git201407161406~saucy/cinder/volume/drivers/rbd.py 2014-07-16 18:06:13.000000000 +0000 +++ cinder-2013.2.100+git201407161842~saucy/cinder/volume/drivers/rbd.py 2014-07-16 22:42:43.000000000 +0000 @@ -631,7 +631,7 @@ "connection from a client that has crashed and, " "if so, may be resolved by retrying the delete " "after 30 seconds has elapsed.")) - LOG.error(msg) + LOG.warn(msg) # Now raise this so that volume stays available so that we # delete can be retried. raise exception.VolumeIsBusy(msg, volume_name=volume_name) diff -Nru cinder-2013.2.100+git201407161406~saucy/debian/changelog cinder-2013.2.100+git201407161842~saucy/debian/changelog --- cinder-2013.2.100+git201407161406~saucy/debian/changelog 2014-07-16 18:09:33.000000000 +0000 +++ cinder-2013.2.100+git201407161842~saucy/debian/changelog 2014-07-16 22:45:02.000000000 +0000 @@ -1,9 +1,9 @@ -cinder (1:2013.2.100+git201407161406~saucy-0ubuntu1) saucy; urgency=medium +cinder (1:2013.2.100+git201407161842~saucy-0ubuntu1) saucy; urgency=medium * Automated Ubuntu testing build: * No change rebuild. - -- Openstack Ubuntu Testing Bot Wed, 16 Jul 2014 14:07:22 -0400 + -- Openstack Ubuntu Testing Bot Wed, 16 Jul 2014 18:43:24 -0400 cinder (1:2013.2.3-0ubuntu1) saucy-proposed; urgency=medium