Merge remote-tracking branch 'origin/4.18' into 4.19

Author: yadvr

plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java

@@ -41,6 +41,7 @@
 import com.linbit.linstor.api.model.ApiCallRcList;
 import com.linbit.linstor.api.model.Properties;
 import com.linbit.linstor.api.model.ProviderKind;
+import com.linbit.linstor.api.model.Resource;
 import com.linbit.linstor.api.model.ResourceDefinition;
 import com.linbit.linstor.api.model.ResourceDefinitionModify;
 import com.linbit.linstor.api.model.ResourceGroupSpawn;
@@ -281,7 +282,7 @@ public boolean connectPhysicalDisk(String volumePath, KVMStoragePool pool, Map<S
     public boolean disconnectPhysicalDisk(String volumePath, KVMStoragePool pool)
     {
         s_logger.debug("Linstor: disconnectPhysicalDisk " + pool.getUuid() + ":" + volumePath);
-        return true;
+        return false;
     }
 
     @Override
@@ -317,40 +318,44 @@ public boolean disconnectPhysicalDiskByPath(String localPath)
             s_logger.debug("Linstor: Using storpool: " + pool.getUuid());
             final DevelopersApi api = getLinstorAPI(pool);
 
-            try
-            {
+            Optional<ResourceWithVolumes> optRsc;
+            try {
                 List<ResourceWithVolumes> resources = api.viewResources(
-                    Collections.singletonList(localNodeName),
-                    null,
-                    null,
-                    null,
-                    null,
-                    null);
-
-                Optional<ResourceWithVolumes> rsc = getResourceByPath(resources, localPath);
+                        Collections.singletonList(localNodeName),
+                        null,
+                        null,
+                        null,
+                        null,
+                        null);
+
+                optRsc = getResourceByPath(resources, localPath);
+            } catch (ApiException apiEx) {
+                // couldn't query linstor controller
+                s_logger.error(apiEx.getBestMessage());
+                return false;
+            }
 
-                if (rsc.isPresent())
-                {
+            if (optRsc.isPresent()) {
+                try {
+                    Resource rsc = optRsc.get();
                     ResourceDefinitionModify rdm = new ResourceDefinitionModify();
                     rdm.deleteProps(Collections.singletonList("DrbdOptions/Net/allow-two-primaries"));
-                    ApiCallRcList answers = api.resourceDefinitionModify(rsc.get().getName(), rdm);
-                    if (answers.hasError())
-                    {
+                    ApiCallRcList answers = api.resourceDefinitionModify(rsc.getName(), rdm);
+                    if (answers.hasError()) {
                         s_logger.error(
                                 String.format("Failed to remove 'allow-two-primaries' on %s: %s",
-                                        rsc.get().getName(), LinstorUtil.getBestErrorMessage(answers)));
+                                        rsc.getName(), LinstorUtil.getBestErrorMessage(answers)));
                         // do not fail here as removing allow-two-primaries property isn't fatal
                     }
-
-                    return true;
+                } catch(ApiException apiEx){
+                    s_logger.error(apiEx.getBestMessage());
+                    // do not fail here as removing allow-two-primaries property isn't fatal
                 }
-                s_logger.warn("Linstor: Couldn't find resource for this path: " + localPath);
-            } catch (ApiException apiEx) {
-                s_logger.error(apiEx.getBestMessage());
-                // do not fail here as removing allow-two-primaries property isn't fatal
+                return true;
             }
         }
-        return true;
+        s_logger.info("Linstor: Couldn't find resource for this path: " + localPath);
+        return false;
     }
 
     @Override