diff --git a/.gitignore b/.gitignore
index 14050d4e4..d4f03a0df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@ system-test/*key.json
 .DS_Store
 package-lock.json
 __pycache__
-.vscode
\ No newline at end of file
diff --git a/src/v1/spanner_client_config.json b/src/v1/spanner_client_config.json
index f1ed7096b..3d5086946 100644
--- a/src/v1/spanner_client_config.json
+++ b/src/v1/spanner_client_config.json
@@ -7,7 +7,8 @@
           "DEADLINE_EXCEEDED",
           "UNAVAILABLE"
         ],
-        "unavailable": [
+        "resource_exhausted_unavailable": [
+          "RESOURCE_EXHAUSTED",
           "UNAVAILABLE"
         ]
       },
@@ -34,32 +35,32 @@
       "methods": {
         "CreateSession": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "BatchCreateSessions": {
           "timeout_millis": 60000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "GetSession": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "ListSessions": {
           "timeout_millis": 3600000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "DeleteSession": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "ExecuteSql": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "ExecuteStreamingSql": {
@@ -69,12 +70,12 @@
         },
         "ExecuteBatchDml": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "Read": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "StreamingRead": {
@@ -84,27 +85,27 @@
         },
         "BeginTransaction": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "Commit": {
           "timeout_millis": 3600000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "Rollback": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "PartitionQuery": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "PartitionRead": {
           "timeout_millis": 30000,
-          "retry_codes_name": "unavailable",
+          "retry_codes_name": "resource_exhausted_unavailable",
           "retry_params_name": "9442ca297df43f7314712e1a19d003838e738a45"
         },
         "BatchWrite": {