MANTA-3363 Some MPU operations don't log shard information in muskie …

…audit entry
TritonDataCenter · Oct 6, 2017 · 8399947 · 8399947
1 parent 2e4845c
commit 8399947
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/audit.js b/lib/audit.js
@@ -271,6 +271,8 @@ function auditLogger(options) {
         obj.sharksContacted = req.sharksContacted;
         obj.entryShard = req.entryShard;
         obj.parentShard = req.parentShard;
+        obj.uploadRecordShard = req.uploadRecordShard;
+        obj.finalizingRecordShard = req.finalizingRecordShard;
 
         if (req.route) {
             obj.route = req.route.name;

diff --git a/lib/uploads/common.js b/lib/uploads/common.js
@@ -553,6 +553,10 @@ function loadUploadRecord(upload, cb) {
             assert.ok(wrap._etag);
             record.toSave._etag = wrap._etag;
 
+            if (wrap && wrap._node) {
+                upload.req.uploadRecordShard = wrap._node.pnode;
+            }
+
             cb(null, record.loaded.upload);
         }
     });
@@ -570,12 +574,17 @@ function loadFinalizingRecord(upload, cb) {
         requestId: upload.req.getId()
     };
 
-    upload.req.moray.getFinalizingMetadata(options, function (err, md) {
+    upload.req.moray.getFinalizingMetadata(options, function (err, md, wrap) {
         if (err) {
             cb(err);
         } else {
             assert.ok(md);
             record.loaded = md;
+
+            if (wrap && wrap._node) {
+                upload.req.finalizingRecordShard = wrap._node.pnode;
+            }
+
             cb(null, record.loaded);
         }
     });