From c7e788874f5af05ad64d05ec778196e648d9af56 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 19 Jul 2018 23:01:44 +0300 Subject: [PATCH] remote: temporarily partially disable code for azure Signed-off-by: Ruslan Kuprieiev --- dvc/remote/azure.py | 158 +++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 76 deletions(-) diff --git a/dvc/remote/azure.py b/dvc/remote/azure.py index daca6d0bb..b36c5aadf 100644 --- a/dvc/remote/azure.py +++ b/dvc/remote/azure.py @@ -68,68 +68,71 @@ class RemoteAzure(RemoteBase): self.__blob_service.create_container(self.bucket) return self.__blob_service - def _get_etag(self, bucket, key): - try: - blob = self.blob_service.get_blob_properties(bucket, key) - return blob.properties.etag - except Exception: - return None - - def save_info(self, path_info): - if path_info['scheme'] != self.scheme: - raise NotImplementedError - - return {self.PARAM_ETAG: self._get_etag( - path_info['bucket'], path_info['key'])} - - def save(self, path_info): - if path_info['scheme'] != self.scheme: - raise NotImplementedError - - etag = self._get_etag(path_info['bucket'], path_info['key']) - dest_key = '{}/{}'.format(etag[0:2], etag[2:]) - - self._copy_blob(to_bucket=self.bucket, - to_key=dest_key, - from_bucket=path_info['bucket'], - from_key=path_info['key']) - - return {self.PARAM_ETAG: etag} - - def _copy_blob(self, to_bucket, to_key, from_bucket, from_key): - source = self.blob_service.make_blob_url(from_bucket, from_key) - - copy = self.blob_service.copy_blob(to_bucket, to_key, source) - - if self.COPY_POLL_SECONDS <= 0: - return - - while copy.status != 'success': - time.sleep(self.COPY_POLL_SECONDS) - copy = self.blob_service.get_blob_properties( - to_bucket, to_key).properties.copy - - def checkout(self, path_info, checksum_info): - if path_info['scheme'] != self.scheme: - raise NotImplementedError - - etag = checksum_info.get(self.PARAM_ETAG, None) - if not etag: - return - - self._copy_blob(to_bucket=path_info['bucket'], - to_key=path_info['key'], - from_bucket=self.bucket, - from_key='{}/{}'.format(etag[0:2], etag[2:])) - - def remove(self, path_info): - if path_info['scheme'] != self.scheme: - raise NotImplementedError - - Logger.debug('Removing azure://{}/{}'.format(path_info['bucket'], - path_info['key'])) - - self.blob_service.delete_blob(path_info['bucket'], path_info['key']) +# FIXME: temporarily disabled because of the lack of test for external azure +# dependencies/outputs/cache. +# +# def _get_etag(self, bucket, key): +# try: +# blob = self.blob_service.get_blob_properties(bucket, key) +# return blob.properties.etag +# except Exception: +# return None +# +# def save_info(self, path_info): +# if path_info['scheme'] != self.scheme: +# raise NotImplementedError +# +# return {self.PARAM_ETAG: self._get_etag( +# path_info['bucket'], path_info['key'])} +# +# def save(self, path_info): +# if path_info['scheme'] != self.scheme: +# raise NotImplementedError +# +# etag = self._get_etag(path_info['bucket'], path_info['key']) +# dest_key = '{}/{}'.format(etag[0:2], etag[2:]) +# +# self._copy_blob(to_bucket=self.bucket, +# to_key=dest_key, +# from_bucket=path_info['bucket'], +# from_key=path_info['key']) +# +# return {self.PARAM_ETAG: etag} +# +# def _copy_blob(self, to_bucket, to_key, from_bucket, from_key): +# source = self.blob_service.make_blob_url(from_bucket, from_key) +# +# copy = self.blob_service.copy_blob(to_bucket, to_key, source) +# +# if self.COPY_POLL_SECONDS <= 0: +# return +# +# while copy.status != 'success': +# time.sleep(self.COPY_POLL_SECONDS) +# copy = self.blob_service.get_blob_properties( +# to_bucket, to_key).properties.copy +# +# def checkout(self, path_info, checksum_info): +# if path_info['scheme'] != self.scheme: +# raise NotImplementedError +# +# etag = checksum_info.get(self.PARAM_ETAG, None) +# if not etag: +# return +# +# self._copy_blob(to_bucket=path_info['bucket'], +# to_key=path_info['key'], +# from_bucket=self.bucket, +# from_key='{}/{}'.format(etag[0:2], etag[2:])) +# +# def remove(self, path_info): +# if path_info['scheme'] != self.scheme: +# raise NotImplementedError +# +# Logger.debug('Removing azure://{}/{}'.format(path_info['bucket'], +# path_info['key'])) +# +# self.blob_service.delete_blob(path_info['bucket'], path_info['key']) def md5s_to_path_infos(self, md5s): return [{ @@ -217,17 +220,20 @@ class RemoteAzure(RemoteBase): if not no_progress_bar: progress.finish_target(name) - def gc(self, checksum_infos): - used_etags = [info[self.PARAM_ETAG] for info in checksum_infos['azure']] - used_etags += [info[RemoteLOCAL.PARAM_MD5] for info in checksum_infos['local']] - - all_blobs = self.blob_service.list_blobs(self.bucket) - - for blob in all_blobs: - etag = blob.properties.etag - if etag in used_etags: - continue - path_info = {'scheme': self.scheme, - 'key': blob.name, - 'bucket': self.bucket} - self.remove(path_info) +# FIXME: temporarily disabled because of the lack of test for external azure +# dependencies/outputs/cache. +# +# def gc(self, checksum_infos): +# used_etags = [info[self.PARAM_ETAG] for info in checksum_infos['azure']] +# used_etags += [info[RemoteLOCAL.PARAM_MD5] for info in checksum_infos['local']] +# +# all_blobs = self.blob_service.list_blobs(self.bucket) +# +# for blob in all_blobs: +# etag = blob.properties.etag +# if etag in used_etags: +# continue +# path_info = {'scheme': self.scheme, +# 'key': blob.name, +# 'bucket': self.bucket} +# self.remove(path_info)