Merge pull request #667 from coreos-inc/error-georeplication-local-storage

workers.storagereplication: error on LocalStorage
This commit is contained in:
Silas Sewell 2015-10-20 20:29:24 -04:00
commit fd96f7c1e3

View file

@ -75,8 +75,21 @@ class StorageReplicationWorker(QueueWorker):
if __name__ == "__main__":
if not features.STORAGE_REPLICATION:
logger.debug('Full storage replication disabled; skipping')
logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False)
has_local_storage = False
if features.STORAGE_REPLICATION:
for storage_type, _ in app.config.get('DISTRIBUTED_STORAGE_CONFIG', {}).values():
if storage_type == 'LocalStorage':
has_local_storage = True
break
if not features.STORAGE_REPLICATION or has_local_storage:
if has_local_storage:
logger.error("Storage replication can't be used with local storage")
else:
logger.debug('Full storage replication disabled; skipping')
while True:
time.sleep(10000)