X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5794ce4f00cd583eee74719118516c0c993fca1c..d87717b4ec885059183ef6d7fa6780c343338455:/sdk/python/arvados/collection.py diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py index d530f58b03..7bfdf782f8 100644 --- a/sdk/python/arvados/collection.py +++ b/sdk/python/arvados/collection.py @@ -304,7 +304,7 @@ class _WriterFile(ArvadosFileBase): class CollectionWriter(CollectionBase): KEEP_BLOCK_SIZE = 2**26 - def __init__(self, api_client=None, num_retries=0): + def __init__(self, api_client=None, num_retries=0, replication=None): """Instantiate a CollectionWriter. CollectionWriter lets you build a new Arvados Collection from scratch. @@ -320,9 +320,13 @@ class CollectionWriter(CollectionBase): service requests. Default 0. You may change this value after instantiation, but note those changes may not propagate to related objects like the Keep client. + * replication: The number of copies of each block to store. + If this argument is None or not supplied, replication is + the server-provided default if available, otherwise 2. """ self._api_client = api_client self.num_retries = num_retries + self.replication = (2 if replication is None else replication) self._keep_client = None self._data_buffer = [] self._data_buffer_len = 0 @@ -477,7 +481,9 @@ class CollectionWriter(CollectionBase): data_buffer = ''.join(self._data_buffer) if data_buffer: self._current_stream_locators.append( - self._my_keep().put(data_buffer[0:self.KEEP_BLOCK_SIZE])) + self._my_keep().put( + data_buffer[0:self.KEEP_BLOCK_SIZE], + copies=self.replication)) self._data_buffer = [data_buffer[self.KEEP_BLOCK_SIZE:]] self._data_buffer_len = len(self._data_buffer[0]) @@ -552,8 +558,16 @@ class CollectionWriter(CollectionBase): self._current_file_name = None def finish(self): - # Store the manifest in Keep and return its locator. - return self._my_keep().put(self.manifest_text()) + """Store the manifest in Keep and return its locator. + + This is useful for storing manifest fragments (task outputs) + temporarily in Keep during a Crunch job. + + In other cases you should make a collection instead, by + sending manifest_text() to the API server's "create + collection" endpoint. + """ + return self._my_keep().put(self.manifest_text(), copies=self.replication) def portable_data_hash(self): stripped = self.stripped_manifest() @@ -587,10 +601,9 @@ class ResumableCollectionWriter(CollectionWriter): '_data_buffer', '_dependencies', '_finished_streams', '_queued_dirents', '_queued_trees'] - def __init__(self, api_client=None, num_retries=0): + def __init__(self, api_client=None, **kwargs): self._dependencies = {} - super(ResumableCollectionWriter, self).__init__( - api_client, num_retries=num_retries) + super(ResumableCollectionWriter, self).__init__(api_client, **kwargs) @classmethod def from_state(cls, state, *init_args, **init_kwargs):