Merge pull request #1108 from noobaa/eran_04x_fixes

S3 fixes
noobaa · Apr 28, 2016 · 47869a8 · 47869a8
2 parents ad4ff7e + 5771615
commit 47869a8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/frontend/src/app/components/management/about-form/about-form.html b/frontend/src/app/components/management/about-form/about-form.html
@@ -1,7 +1,7 @@
-<h1 class="heading2">Noobaa Storage Solution</h1>
+<h1 class="heading2">NooBaa Storage Solution</h1>
 
 <p class="container">
-    Current Version: 
+    Current Version:
     <output class="text-tech emphasized" data-bind="value: version"></output>
 </p>
 

diff --git a/frontend/src/app/components/management/create-account-wizard/create-account-wizard.js b/frontend/src/app/components/management/create-account-wizard/create-account-wizard.js
@@ -8,7 +8,7 @@ import { loadBucketList, createAccount } from 'actions';
 
 function makeUserMessage(loginInfo, S3AccessInfo) {
     return `
-<p class="paragraph">Hi, I created a noobaa user for you:</p>
+<p class="paragraph">Hi, I created a NooBaa user for you:</p>
 ${makeLoginMessage(loginInfo)}<br>
 ${S3AccessInfo ? makeS3AccessMessage(S3AccessInfo) : ''}
     `;
@@ -42,7 +42,7 @@ class CreateAccountWizardViewModel {
         this.detailsStepTemplate = detailsStepTemplate;
 
         this.emailAddress = ko.observable()
-            .extend({ 
+            .extend({
                 required: { message: 'Please enter an email address' },
                 email: { message: 'Please enter a valid email address' },
                 notIn: {
@@ -91,7 +91,7 @@ class CreateAccountWizardViewModel {
 
     validateStep(step) {
         switch (step) {
-            case 1: 
+            case 1:
                 if (this.nameAndPermissionsErrors().length > 0) {
                     this.nameAndPermissionsErrors.showAllMessages();
                     return false;
@@ -119,9 +119,9 @@ class CreateAccountWizardViewModel {
 
     create() {
         createAccount(
-            systemInfo().name, 
-            this.emailAddress(), 
-            this.password, 
+            systemInfo().name,
+            this.emailAddress(),
+            this.password,
             this.accessKeys,
             this.enableS3Access() ? this.selectedBuckets() : undefined
         );
@@ -139,4 +139,4 @@ class CreateAccountWizardViewModel {
 export default {
     viewModel: CreateAccountWizardViewModel,
     template: template
-};
+};
diff --git a/src/api/object_io.js b/src/api/object_io.js
@@ -173,7 +173,17 @@ class ObjectIO {
                     .return(md5_digest);
             }, err => {
                 dbg.log0('upload_stream: error write stream', params.key, err);
-                throw err;
+                return params.client.object.delete_object(_.pick(params,
+                        'bucket',
+                        'key'))
+                    .then(() => {
+                        dbg.log0('removed partial object', params.key, 'from bucket', params.bucket);
+                        throw err;
+                    })
+                    .fail(() => {
+                        throw err;
+                    });
+
             });
     }
 
@@ -286,8 +296,7 @@ class ObjectIO {
         return pipeline.run()
             .then(() => {
                 var sha256_promise = '';
-                if(params.calculate_sha256)
-                {
+                if (params.calculate_sha256) {
                     sha256_promise = P.resolve(sha256_stream && sha256_stream.wait_digest());
                 }
                 return P.all([P.resolve(md5_stream && md5_stream.wait_digest()), sha256_promise])

diff --git a/src/s3/s3_controller.js b/src/s3/s3_controller.js
@@ -479,10 +479,7 @@ class S3Controller {
      * http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectDELETE.html
      */
     delete_object(req) {
-        return req.rpc_client.object.delete_object({
-            bucket: req.params.bucket,
-            key: req.params.key
-        });
+        return req.rpc_client.object.delete_object(this._object_path(req));
     }
 
 

diff --git a/src/server/node_monitor.js b/src/server/node_monitor.js
@@ -270,7 +270,6 @@ function update_heartbeat(req, reply_token) {
         ])
         .spread(function(node_arg, storage_used) {
             node = node_arg;
-            dbg.log0('ETET:storage_used', storage_used);
             if (!node) {
                 // we don't fail here because failures would keep retrying
                 // to find this node, and the node is not in the db.
@@ -475,7 +474,7 @@ function collect_agent_diagnostics(req) {
 }
 
 function set_debug_node(req) {
-    var target = req.rpc_params.target;    
+    var target = req.rpc_params.target;
     return P.fcall(function() {
             return server_rpc.client.agent.set_debug_node({
                 level: req.rpc_params.level
@@ -545,4 +544,4 @@ function _resync_agents() {
                 throw new Error('Failed resyncing agents to redirector');
             });
     });
-}
+}
diff --git a/src/server/object_server.js b/src/server/object_server.js
@@ -153,6 +153,10 @@ function complete_object_upload(req) {
                         dbg.log0('aggregated_md5', obj_etag);
                         return map_writer.fix_multipart_parts(obj);
                     });
+            }else
+            {
+                dbg.log0('complete_object_upload no fix for',obj);
+                return obj.size;
             }
         })
         .then(object_size => {