Change in asterixdb[master]: [NO ISSUE]: Fix rate limiting

[AsterixDB Code Review]

>From Savyasach Reddy <savyasach.enuko...@couchbase.com>:

Savyasach Reddy has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19329 )


Change subject: [NO ISSUE]: Fix rate limiting
......................................................................

[NO ISSUE]: Fix rate limiting

- user model changes: no
- storage format changes: no
- interface changes: no

details:
- Fix write limits in GCS

Ext-ref: MB-64820
Change-Id: Ibce236873adbbb1a4f231dd30176c1ed247905a9
---
M 
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/google/gcs/GCSWriter.java
1 file changed, 25 insertions(+), 7 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/29/19329/1

diff --git 
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/google/gcs/GCSWriter.java
 
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/google/gcs/GCSWriter.java
index 8d68f01..65e3b54 100644
--- 
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/google/gcs/GCSWriter.java
+++ 
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/google/gcs/GCSWriter.java
@@ -64,26 +64,28 @@
     @Override
     public int write(ByteBuffer page) throws HyracksDataException {
         guardian.checkIsolatedWriteAccess(bucket, path);
-        profiler.objectMultipartUpload();
         setUploadId();
         int written = 0;
         try {
             while (page.hasRemaining()) {
                 written += writer.write(page);
             }
-        } catch (IOException e) {
+        } catch (IOException | RuntimeException e) {
             throw HyracksDataException.create(e);
         }

+        int uploadsTriggered =
+                (int) ((writtenBytes + written) / writeBufferSize) - (int) 
(writtenBytes / writeBufferSize);
+        while (uploadsTriggered-- > 0) {
+            profiler.objectMultipartUpload();
+        }
         writtenBytes += written;
         return written;
     }

     @Override
     public int write(byte[] b, int off, int len) throws HyracksDataException {
-        int written = write(ByteBuffer.wrap(b, off, len));
-        writtenBytes += written;
-        return written;
+        return write(ByteBuffer.wrap(b, off, len));
     }

     @Override
@@ -94,7 +96,6 @@
     @Override
     public void write(int b) throws HyracksDataException {
         write(ByteBuffer.wrap(new byte[] { (byte) b }));
-        writtenBytes += 1;
     }

     @Override
@@ -105,7 +106,7 @@
         try {
             writer.close();
             writer = null;
-        } catch (IOException e) {
+        } catch (IOException | RuntimeException e) {
             throw HyracksDataException.create(e);
         }
         log("FINISHED");

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19329
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Ibce236873adbbb1a4f231dd30176c1ed247905a9
Gerrit-Change-Number: 19329
Gerrit-PatchSet: 1
Gerrit-Owner: Savyasach Reddy <savyasach.enuko...@couchbase.com>
Gerrit-MessageType: newchange