]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "Ensure replication functions check driver status"
authorJenkins <jenkins@review.openstack.org>
Tue, 20 Oct 2015 01:35:30 +0000 (01:35 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 20 Oct 2015 01:35:30 +0000 (01:35 +0000)
1  2 
cinder/tests/unit/test_volume.py
cinder/volume/manager.py

Simple merge
index 75369c8f7136e41866f0fd4786436346a0dbb5af,aa70d39d83b15bc5c47a2ef380480cef340d5252..074904470f8c8d32b7df49240e3102d87a1df308
@@@ -3259,10 -3280,13 +3283,16 @@@ class VolumeManager(manager.SchedulerDe
          NOTE: It's the responsibility of the driver to mask out any
          passwords or sensitive information.
  
 +        `remote_device_id` is required and is used for drivers to identify
 +        the devices they have in use.
 +
          """
+         # NOTE(hemna) We intentionally don't enforce the driver being
+         # initialized here.  because the primary might actually be down,
+         # but we still want to give the driver a chance of doing some work
+         # against the target.  It's entirely up to the driver to deal with
+         # not being able to talk to the primary array that it's configured
+         # to manage.
  
          try:
              volume = self.db.volume_get(context, volume['id'])