Add support for GLACIER_DA and forced GLACIER

Signed-off-by: Utkarsh Srivastava <[email protected]>

Author: tangledbytes

config.js

@@ -196,6 +196,14 @@ config.STS_CORS_EXPOSE_HEADERS = 'ETag';
 
 config.DENY_UPLOAD_TO_STORAGE_CLASS_STANDARD = false;
 
+/**
+ * NSFS_GLACIER_FORCE_STORAGE_CLASS when set to true
+ * will force `GLACIER` storage class if no storage class
+ * is provided and if `STANDARD` storage class is provided
+ * @type {boolean}
+ */
+config.NSFS_GLACIER_FORCE_STORAGE_CLASS = false;
+
 // S3_RESTORE_MAX_DAYS controls that for how many maximum number
 // of days an object can be restored using `restore-object` call.
 config.S3_RESTORE_REQUEST_MAX_DAYS = 30;

src/endpoint/s3/s3_utils.js

@@ -20,6 +20,8 @@ const STORAGE_CLASS_STANDARD = 'STANDARD';
 const STORAGE_CLASS_GLACIER = 'GLACIER'; // "S3 Glacier Flexible Retrieval"
 /** @type {nb.StorageClass} */
 const STORAGE_CLASS_GLACIER_IR = 'GLACIER_IR'; // "S3 Glacier Instant Retrieval"
+/** @type {nb.StorageClass} */
+const STORAGE_CLASS_GLACIER_DA = 'GLACIER_DA'; // "DBS3 specific Storage Class"
 
 const DEFAULT_S3_USER = Object.freeze({
     ID: '123',
@@ -382,6 +384,7 @@ function parse_storage_class(storage_class) {
     if (!storage_class) return STORAGE_CLASS_STANDARD;
     if (storage_class === STORAGE_CLASS_STANDARD) return STORAGE_CLASS_STANDARD;
     if (storage_class === STORAGE_CLASS_GLACIER) return STORAGE_CLASS_GLACIER;
+    if (storage_class === STORAGE_CLASS_GLACIER_DA) return STORAGE_CLASS_GLACIER_DA;
     if (storage_class === STORAGE_CLASS_GLACIER_IR) return STORAGE_CLASS_GLACIER_IR;
     throw new Error(`No such s3 storage class ${storage_class}`);
 }
@@ -822,6 +825,7 @@ function parse_body_public_access_block(req) {
 exports.STORAGE_CLASS_STANDARD = STORAGE_CLASS_STANDARD;
 exports.STORAGE_CLASS_GLACIER = STORAGE_CLASS_GLACIER;
 exports.STORAGE_CLASS_GLACIER_IR = STORAGE_CLASS_GLACIER_IR;
+exports.STORAGE_CLASS_GLACIER_DA = STORAGE_CLASS_GLACIER_DA;
 exports.DEFAULT_S3_USER = DEFAULT_S3_USER;
 exports.DEFAULT_OBJECT_ACL = DEFAULT_OBJECT_ACL;
 exports.decode_chunked_upload = decode_chunked_upload;

src/sdk/namespace_fs.js

@@ -3610,11 +3610,15 @@ class NamespaceFS {
     }
 
     async _is_storage_class_supported(storage_class) {
+        const glacier_storage_classes = [
+            s3_utils.STORAGE_CLASS_GLACIER,
+            s3_utils.STORAGE_CLASS_GLACIER_DA,
+            s3_utils.STORAGE_CLASS_GLACIER_IR,
+        ];
+
         if (!storage_class || storage_class === s3_utils.STORAGE_CLASS_STANDARD) return true;
 
-        if (storage_class === s3_utils.STORAGE_CLASS_GLACIER) {
-            // TODO: Upon integration with underlying systems, we should
-            // check if archiving is actually supported or not
+        if (!storage_class || glacier_storage_classes.includes(storage_class)) {
             return config.NSFS_GLACIER_ENABLED || false;
         }
 

src/sdk/nb.d.ts

@@ -17,7 +17,7 @@ type DigestType = 'sha1' | 'sha256' | 'sha384' | 'sha512';
 type CompressType = 'snappy' | 'zlib';
 type CipherType = 'aes-256-gcm';
 type ParityType = 'isa-c1' | 'isa-rs' | 'cm256';
-type StorageClass = 'STANDARD' | 'GLACIER' | 'GLACIER_IR';
+type StorageClass = 'STANDARD' | 'GLACIER' | 'GLACIER_IR' | 'GLACIER_DA';
 type ResourceType = 'HOSTS' | 'CLOUD' | 'INTERNAL';
 type NodeType =
     'BLOCK_STORE_S3' |

src/util/http_utils.js

@@ -23,6 +23,7 @@ const net_utils = require('./net_utils');
 const time_utils = require('./time_utils');
 const cloud_utils = require('./cloud_utils');
 const ssl_utils = require('../util/ssl_utils');
+const s3_utils = require('../endpoint/s3/s3_utils');
 const lifecycle_utils = require('../../src/util/lifecycle_utils');
 const RpcError = require('../rpc/rpc_error');
 const S3Error = require('../endpoint/s3/s3_errors').S3Error;
@@ -654,6 +655,13 @@ function check_headers(req, options) {
     if (!is_presigned_url && (Math.abs(Date.now() - req_time) > config.AMZ_DATE_MAX_TIME_SKEW_MILLIS)) {
         throw new options.ErrorClass(options.error_request_time_too_skewed);
     }
+
+    if (
+        config.NSFS_GLACIER_FORCE_STORAGE_CLASS &&
+        s3_utils.parse_storage_class_header(req) === s3_utils.STORAGE_CLASS_STANDARD
+    ) {
+        req.headers['x-amz-storage-class'] = s3_utils.STORAGE_CLASS_GLACIER;
+    }
 }
 
 /**