Updated internal rate limiter processing to work properly with Instance Principals

Author: connelly38

CHANGELOG.md

@@ -3,10 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [Unreleased]
+
+### Changed
+- Updated copyrights to 2022
+
+### Fixed
+- Cloud only: Updated internal rate limiter processing to work
+properly with Instance Principals
+
 ## [5.2.30] 2022-01-21
 
 ### Changed
-- Updated OCI regions
+- Cloud only: Updated OCI regions
 
 ### Added
 - Added client statistics. Users can enable internal driver statistics by

driver/src/main/java/oracle/nosql/driver/http/Client.java

@@ -353,6 +353,15 @@ public Result execute(Request kvRequest) {
         /* clear any retry stats that may exist on this request object */
         kvRequest.setRetryStats(null);
 
+        /*
+         * If the request doesn't set an explicit compartment, use
+         * the config default if provided.
+         */
+        if (kvRequest.getCompartment() == null) {
+            kvRequest.setCompartmentInternal(
+                config.getDefaultCompartment());
+        }
+
         int rateDelayedMs = 0;
         boolean checkReadUnits = false;
         boolean checkWriteUnits = false;
@@ -376,7 +385,8 @@ public Result execute(Request kvRequest) {
                 writeLimiter = rateLimiterMap.getWriteLimiter(tableName);
                 if (readLimiter == null && writeLimiter == null) {
                     if (kvRequest.doesReads() || kvRequest.doesWrites()) {
-                        backgroundUpdateLimiters(tableName);
+                        backgroundUpdateLimiters(tableName,
+                                                 kvRequest.getCompartment());
                     }
                 } else {
                     checkReadUnits = kvRequest.doesReads();
@@ -499,14 +509,6 @@ public Result execute(Request kvRequest) {
                     .add(REQUEST_ID_HEADER, requestId)
                     .setInt(CONTENT_LENGTH, contentLength);
 
-                /*
-                 * If the request doesn't set an explicit compartment, use
-                 * the config default if provided.
-                 */
-                if (kvRequest.getCompartment() == null) {
-                    kvRequest.setCompartmentInternal(
-                        config.getDefaultCompartment());
-                }
                 authProvider.setRequiredHeaders(authString, kvRequest, headers);
 
                 if (isLoggable(logger, Level.FINE)) {
@@ -1020,14 +1022,17 @@ private void setTableNeedsRefresh(String tableName, boolean needsRefresh) {
      * Query table limits and create rate limiters for a table in a
      * short-lived background thread.
      */
-    private synchronized void backgroundUpdateLimiters(String tableName) {
+    private synchronized void backgroundUpdateLimiters(String tableName,
+                                                       String compartmentId) {
         if (tableNeedsRefresh(tableName) == false) {
             return;
         }
         setTableNeedsRefresh(tableName, false);
 
         try {
-            threadPool.execute(() -> {updateTableLimiters(tableName);});
+            threadPool.execute(() -> {
+                updateTableLimiters(tableName, compartmentId);
+            });
         } catch (RejectedExecutionException e) {
             setTableNeedsRefresh(tableName, true);
         }
@@ -1036,10 +1041,11 @@ private synchronized void backgroundUpdateLimiters(String tableName) {
     /*
      * This is meant to be run in a background thread
      */
-    private void updateTableLimiters(String tableName) {
+    private void updateTableLimiters(String tableName, String compartmentId) {
 
         GetTableRequest gtr = new GetTableRequest()
             .setTableName(tableName)
+            .setCompartment(compartmentId)
             .setTimeout(1000);
         TableResult res = null;
         try {