diff options
6 files changed, 55 insertions, 3 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index fe407f204..7b71df2b0 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -500,6 +500,9 @@ getBucketName = map toLower <$$> M.lookup "bucket" getStorageClass :: RemoteConfig -> S3.StorageClass getStorageClass c = case M.lookup "storageclass" c of Just "REDUCED_REDUNDANCY" -> S3.ReducedRedundancy +#if MIN_VERSION_aws(0,13,0) + Just s -> S3.OtherStorageClass (T.pack s) +#endif _ -> S3.Standard getPartSize :: RemoteConfig -> Maybe Integer diff --git a/debian/changelog b/debian/changelog index 3ec572d04..9233d3073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ git-annex (5.20150917) UNRELEASED; urgency=medium uses the git-annex branch and would create it if it were missing. * assistant: When updating ~/.ssh/config, preserve any symlinks. * webapp: Remove the "disable remote" feature from the UI. + * S3: When built with aws-0.13.0, supports using more storage classes. + In particular, storageclass=STANDARD_IA to use Amazon's + new Infrequently Accessed storage, and storageclass=NEARLINE + to use Google's NearLine storage. -- Joey Hess <id@joeyh.name> Wed, 16 Sep 2015 12:23:33 -0400 diff --git a/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_1_a10aaa758daee3ca0b064c60c0382ce8._comment b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_1_a10aaa758daee3ca0b064c60c0382ce8._comment new file mode 100644 index 000000000..bc4d5e95c --- /dev/null +++ b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage/comment_1_a10aaa758daee3ca0b064c60c0382ce8._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-09-17T21:09:24Z" + content=""" +It's now possible to use storageclass=NEARLINE, when git-annex is built +with aws-0.13.0. So, the approach of manually creating the bucket with the +desired storage class should work now. + +I'm unsure if the first method, of letting git-annex create the bucket, +will work now. Can you test? It may work now too with +storageclass=NEARLINE. While no storage class is currently specified when +creating the bucket (that's not in the S3 api at all); but once the bucket +exists, with whatever storage class is default, git-annex will specify +NEARLINE when storing objects in it. Seems a good chance this will work, +and it'd be easier than extending the aws library with google-specific +features. +"""]] diff --git a/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment b/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment new file mode 100644 index 000000000..1012cc729 --- /dev/null +++ b/doc/bugs/Windows:_Doesn__39__t_want_to_handle_files_with_2_dots_in_filename/comment_1_43f6de166d1811e9f9bd6e6d8b152e05._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-09-22T15:56:37Z" + content=""" +Unable to reproduce this on Windows XP. + +Is there anything in .git/annex/daemon.log that might help with debugging? +"""]] diff --git a/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_c021d9ad7f31daab7ac3455554e1cc42._comment b/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_c021d9ad7f31daab7ac3455554e1cc42._comment new file mode 100644 index 000000000..43ef22629 --- /dev/null +++ b/doc/bugs/gcrypt_gives_false___34__remote_ID_has_changed__34___warning_after_a_sync_fails_because_network_is_down/comment_2_c021d9ad7f31daab7ac3455554e1cc42._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2015-09-22T15:58:18Z" + content=""" +Yes, I'll take reasonable patches, that's why I have that fork of +git-remote.gcrypt. +"""]] diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn index 33f0410bb..f4d1c552e 100644 --- a/doc/special_remotes/S3.mdwn +++ b/doc/special_remotes/S3.mdwn @@ -37,9 +37,19 @@ the S3 remote. "us-west-1", "us-west-2", "ap-southeast-1", "ap-southeast-2", and "sa-east-1". -* `storageclass` - Default is "STANDARD". If you have configured git-annex - to preserve multiple [[copies]], consider setting this to "REDUCED_REDUNDANCY" - to save money. +* `storageclass` - Default is "STANDARD". + Consult S3 provider documentation for pricing details and available + storage classes. + + When using Amazon S3, if you have configured git-annex to preserve + multiple [[copies]], consider setting this to "REDUCED_REDUNDANCY" + to save money. Or, if the remote will be used for backup or archival, + and so its files are Infrequently Accessed, "STANDARD_IA" is also a + good choice to save money. + + Note that changing the storage class of an existing S3 remote will + affect new objects sent to the remote, but not objects already + stored there. * `host` and `port` - Specify in order to use a different, S3 compatable service. |