Change iSCSI storage connection validation to properly avoid duplications #551

mkemel · 2022-07-24T10:29:44Z

Currently when adding/updating iSCSI storage server connection, there
is a validation that checks if a duplicate connection exists by iqn,
address, port, portal, username and password. This allows creating
two storage connections with the same iqn, address and port, but with
different portals.

There cannot be two portals with the same iqn-address-port, thus
creating two such connections does not make sense and will lead to
errors connecting the host to storage.

This change fixes the validation to fail add/update request if
connection with the same iqn-address-port combination exists

Bug-Url: https://bugzilla.redhat.com/2079903

barpavel · 2022-07-24T11:24:34Z

packaging/dbscripts/storages_san_sp.sql

+        AND (connection = v_connection)
+        AND (
+            port = v_port
+            OR (


If port and v_port are NULL, wouldn't the first part port = v_port catch it?
Is this OR required?

Good point. I actually copied it from the previously used query, but I can't quite understand what is the purpose of this check. In our case these values should not be null anyway.

barpavel · 2022-07-24T11:27:45Z

...dules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ISCSIStorageHelper.java

+                        connection.getPort(),
+                        connection.getIqn()
+                );
+        if (connections != null && !connections.isEmpty()) {


IMHO can be simplified:

if (CollectionUtils.isEmpty(connections)) { return null; } return connections.get(0);

it can be simplified even further - the result should never be null

ahadas · 2022-07-24T12:53:08Z

...in/java/org/ovirt/engine/core/bll/storage/connection/StorageServerConnectionCommandBase.java

@@ -80,7 +80,7 @@ protected String isConnWithSameDetailsExists(StorageServerConnections connection
            String connectionField = connection.getConnection();
            connections = storageServerConnectionDao.getAllForStorage(connectionField);
        } else {
-            StorageServerConnections sameConnection = iscsiStorageHelper.findConnectionWithSameDetails(connection);
+            StorageServerConnections sameConnection = iscsiStorageHelper.findConnectionByAddressPortAndIqn(connection);


is there a reason not to change findConnectionWithSameDetails?

It is used elsewhere, there's even a comment that warns you from changing it

Another thought: maybe better if findConnectionByAddressPortAndIqn() to simply return the list of all connections as received from storageServerConnectionDao.getStorageConnectionsByConnectionPortAndIqn (that can be or not be an empty list)?
That will simplify the findConnectionByAddressPortAndIqn() method (that just needs to be renamed to plural "Connections"), will simplify this method (just put the result into connections local variable). No need for all those List --> single element --> back to List redundant code.

ahadas · 2022-07-24T12:58:08Z

...dules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ISCSIStorageHelper.java

+                        connection.getPort(),
+                        connection.getIqn()
+                );
+        if (connections != null && !connections.isEmpty()) {


it can be simplified even further - the result should never be null

ahadas · 2022-07-26T11:35:06Z

/ost

...in/java/org/ovirt/engine/core/bll/storage/connection/StorageServerConnectionCommandBase.java

barpavel · 2022-07-26T13:29:23Z

...dules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ISCSIStorageHelper.java

@@ -207,6 +207,14 @@ public StorageServerConnections findConnectionWithSameDetails(StorageServerConne
        return null;
    }

+    public List<StorageServerConnections> findConnectionByAddressPortAndIqn(StorageServerConnections connection) {


Maybe rename to findConnectionsByAddressPortAndIqn?
Add "s" for plural...

...ager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoImpl.java

Currently when adding/updating iSCSI storage server connection, there is a validation that checks if duplicate connection exists by iqn, address, port, portal, username and password. This allows creating two storage connections with the same iqn, address and port, but with different portals. There cannot be two portals with the same iqn-address-port, thus creating two such connections does not make sense and will lead to errors connecting the host to storage. This change fixes the validation to fail add/update request if connection with the same iqn-address-port combination exists Bug-Url: https://bugzilla.redhat.com/2079903

barpavel

LGTM :)

mkemel requested review from bennyz, ahadas, emesika and mwperina as code owners July 24, 2022 10:29

mkemel requested review from aesteve-rh, ArtiomDivak and barpavel July 24, 2022 10:30

barpavel reviewed Jul 24, 2022

View reviewed changes

ahadas added the storage label Jul 24, 2022

ahadas reviewed Jul 24, 2022

View reviewed changes

mkemel force-pushed the storage_connection_validation_fix branch from 41f92d2 to e903e2b Compare July 24, 2022 14:05

mkemel changed the title ~~core: change iSCSI storage connection validation to properly avoid duplications~~ Change iSCSI storage connection validation to properly avoid duplications Jul 25, 2022

mkemel force-pushed the storage_connection_validation_fix branch from e903e2b to c4154fa Compare July 26, 2022 05:38

ahadas approved these changes Jul 26, 2022

View reviewed changes

barpavel reviewed Jul 26, 2022

View reviewed changes

...in/java/org/ovirt/engine/core/bll/storage/connection/StorageServerConnectionCommandBase.java Show resolved Hide resolved

barpavel approved these changes Jul 26, 2022

View reviewed changes

barpavel reviewed Jul 26, 2022

View reviewed changes

...ager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoImpl.java Show resolved Hide resolved

mkemel force-pushed the storage_connection_validation_fix branch from c4154fa to cfbf20d Compare July 27, 2022 10:55

barpavel self-requested a review July 27, 2022 13:30

barpavel approved these changes Jul 27, 2022

View reviewed changes

michalskrivanek merged commit 7543e6b into oVirt:master Jul 28, 2022

mkemel deleted the storage_connection_validation_fix branch November 27, 2022 10:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change iSCSI storage connection validation to properly avoid duplications #551

Change iSCSI storage connection validation to properly avoid duplications #551

mkemel commented Jul 24, 2022 •

edited by ahadas

Loading

barpavel Jul 24, 2022

mkemel Jul 26, 2022

barpavel Jul 24, 2022

ahadas Jul 24, 2022

ahadas Jul 24, 2022

mkemel Jul 24, 2022

barpavel Jul 24, 2022

mkemel Jul 26, 2022

ahadas Jul 24, 2022

ahadas commented Jul 26, 2022

barpavel Jul 26, 2022

mkemel Jul 27, 2022

barpavel left a comment

Change iSCSI storage connection validation to properly avoid duplications #551

Change iSCSI storage connection validation to properly avoid duplications #551

Conversation

mkemel commented Jul 24, 2022 • edited by ahadas Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahadas commented Jul 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

barpavel left a comment

Choose a reason for hiding this comment

mkemel commented Jul 24, 2022 •

edited by ahadas

Loading