Check for status code 404 instead of ServiceNotFoundException in disc…

…overed volumes Performance job is broken because of this, as apparently in cluster get returns ProtocolException instead of ServiceNotFoundException when a document is not found. Change-Id: I5cbe858934994670cd88a80a2e9e98d0df89217b Reviewed-on: http://bellevue-ci.eng.vmware.com:8080/22814 Reviewed-by: Aleksandar Angelov <[email protected]> Upgrade-Verified: jenkins <[email protected]> Closures-Verified: jenkins <[email protected]> Bellevue-Verified: jenkins <[email protected]> CS-Verified: jenkins <[email protected]>
shism2 · Dec 6, 2017 · 849a01d · 849a01d
1 parent c6c9f2c
commit 849a01d
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/compute/src/main/java/com/vmware/admiral/compute/container/HostVolumeListDataCollection.java b/compute/src/main/java/com/vmware/admiral/compute/container/HostVolumeListDataCollection.java
@@ -48,7 +48,6 @@
 import com.vmware.xenon.common.Operation;
 import com.vmware.xenon.common.ServiceDocument;
 import com.vmware.xenon.common.ServiceDocumentDescription.PropertyIndexingOption;
-import com.vmware.xenon.common.ServiceHost.ServiceNotFoundException;
 import com.vmware.xenon.common.StatefulService;
 import com.vmware.xenon.common.TaskState;
 import com.vmware.xenon.common.TaskState.TaskStage;
@@ -430,15 +429,15 @@ private void createDiscoveredContainerVolumes(List<ContainerVolumeState> volumeS
                         .createGet(this, possibleVolumeSelfLink)
                         .setCompletion(
                                 (o, ex) -> {
-                                    if (ex != null ) {
-                                        if (ex instanceof ServiceNotFoundException) {
-                                            createDiscoveredContainerVolume(callback, counter,
-                                                    volumeState);
-                                        } else {
-                                            logSevere("Failed to get volume %s : %s",
-                                                    volumeState.name, ex.getMessage());
-                                            counter.getAndDecrement();
-                                        }
+                                    if (o.getStatusCode() == Operation.STATUS_CODE_NOT_FOUND) {
+                                        createDiscoveredContainerVolume(callback, counter,
+                                                volumeState);
+                                        return;
+                                    }
+                                    if (ex != null) {
+                                        logSevere("Failed to get volume %s : %s", volumeState.name,
+                                                ex.getMessage());
+                                        counter.getAndDecrement();
                                     } else if (counter.decrementAndGet() == 0) {
                                         callback.accept(null);
                                     }