Merge pull request #1 from Azure/main

EncryptionKeyJsonProperty Merge Conflicts
aayush3011 · Sep 17, 2021 · 6657a97 · 6657a97
2 parents d62dacf + 9f5ef38
commit 6657a97
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -585,7 +585,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-mixedreality-remoterendering</artifactId>
-      <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
+      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
     </dependency>
   </dependencies>
   <build>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -101,7 +101,7 @@ com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-webpubsub;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-mixedreality-authentication;1.1.1;1.2.0-beta.1
-com.azure:azure-mixedreality-remoterendering;1.0.0;1.1.0
+com.azure:azure-mixedreality-remoterendering;1.1.0;1.2.0-beta.1
 com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-monitor-query;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-monitor-query-perf;1.0.0-beta.1;1.0.0-beta.1

diff --git a/...cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/QuorumReader.java b/...cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/QuorumReader.java
@@ -242,7 +242,9 @@ public Mono<StoreResponse> readStrongAsync(
                     });
             }).repeat(maxNumberOfReadQuorumRetries)
                    .takeUntil(dummy -> !shouldRetryOnSecondary.v)
-                .concatWith(Flux.defer(() -> {
+                   //   In case there is an empty response from above flatMap, it means we could not complete read quorum
+                   //   So we will throw an error, which will be eventually retried.
+                   .switchIfEmpty(Flux.defer(() -> {
                        logger.warn("Could not complete read quorum with read quorum value of {}", readQuorumValue);
 
                     return Flux.error(new GoneException(
@@ -634,8 +636,10 @@ private Mono<Boolean> waitForReadBarrierAsync(
                            }
 
                             return Flux.empty();
-                       })).
-                       concatWith(
+                       }))
+                   //   In case the above flux returns empty (which it will after all the retries have been exhausted),
+                   //   We will just return false
+                   .switchIfEmpty(
                                 Flux.defer(() -> {
                                logger.debug("QuorumReader: waitForReadBarrierAsync - TargetGlobalCommittedLsn: {}, MaxGlobalCommittedLsn: {}.", targetGlobalCommittedLSN, maxGlobalCommittedLsn);
                                     return Flux.just(false);

diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Release History
 
-## 1.1.0 (2021-09-16)
+## 1.2.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
+## 1.1.0 (2021-09-17)
 
 ### Other changes
 - Minor logging change to ensure MS-CV values are not redacted from the log by default.

diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-mixedreality-remoterendering</artifactId>
-  <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
+  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
 
   <name>Microsoft Azure SDK for Remote Rendering</name>
   <description>This package contains Microsoft Azure SDK for Remote Rendering.</description>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-mixedreality-authentication</artifactId>
-      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-authentication;current} -->
+      <version>1.1.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-authentication;dependency} -->
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/sdk/remoterendering/pom.xml b/sdk/remoterendering/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-mixedreality-remoterendering</artifactId>
-          <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
+          <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
         </dependency>
       </dependencies>
       <build>