Greg Padgett has uploaded a new change for review. Change subject: webadmin, engine: Use NFS v3 as default ......................................................................
webadmin, engine: Use NFS v3 as default Change NFS version to v3 as default in UI, and add 'auto' param support to vdsm in ConnectStorageServerVDSCommand. This allows pre-3.1 storage pools to keep using v3 after upgrading (in which case protocol_version is not passed to vdsm), and gives the option using NFS version auto negotiation for SDs in newer pools. Bug-Url: https://bugzilla.redhat.com/855729 Change-Id: I831ecc7050a5487d5365efb94342a3c170dddc6c Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java 3 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/8242/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java index d16289a..042e965 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java @@ -41,8 +41,12 @@ return result; } + private static void addOrDefault(Map<String, String> map, Object what, String alt, String name) { + map.put(name, what != null ? what.toString() : alt); + } + private static void addOrEmpty(Map<String, String> map, String what, String name) { - map.put(name, StringUtils.isEmpty(what) ? "" : what); + addOrDefault(map, what, "", name); } private static void addIfNotNullOrEmpty(Map<String, String> map, String what, String name) { @@ -61,7 +65,7 @@ final storage_pool storage_pool) { // for information, see _connectionDict2ConnectionInfo in vdsm/storage/hsm.py Map<String, String> con = new HashMap<String, String>(); - con.put("id", (connection.getid() != null) ? connection.getid() : Guid.Empty.toString()); + addOrDefault(con, connection.getid(), Guid.Empty.toString(), "id"); addOrEmpty(con, connection.getconnection(), "connection"); addOrEmpty(con, connection.getportal(), "portal"); addOrEmpty(con, connection.getport(), "port"); @@ -76,7 +80,8 @@ // we should not send a key with an empty value addIfNotNullOrEmpty(con, connection.getMountOptions(), "mnt_options"); addIfNotNullOrEmpty(con, connection.getVfsType(), "vfs_type"); - addIfNotNullOrEmpty(con, connection.getNfsVersion(), "protocol_version"); + // For protocol_version - null in db indicates auto version negotiation + addOrDefault(con, connection.getNfsVersion(), "auto", "protocol_version"); addIfNotNullOrEmpty(con, connection.getNfsTimeo(), "timeout"); addIfNotNullOrEmpty(con, connection.getNfsRetrans(), "retrans"); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java index c03cb74..02aa6c5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java @@ -142,9 +142,9 @@ setVersion(new ListModel()); List<EntityModel> versionItems = new ArrayList<EntityModel>(); - versionItems.add(new EntityModel(constants.nfsVersionAutoNegotiate(), null)); versionItems.add(new EntityModel(constants.nfsVersion3(), (short) 3)); versionItems.add(new EntityModel(constants.nfsVersion4(), (short) 4)); + versionItems.add(new EntityModel(constants.nfsVersionAutoNegotiate(), null)); getVersion().setItems(versionItems); setRetransmissions(new EntityModel()); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 17ef8ee..507c917 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -1437,10 +1437,10 @@ @DefaultStringValue("Special Keys") String specialKeys(); - @DefaultStringValue("Auto Negotiate (default)") + @DefaultStringValue("Auto Negotiate") String nfsVersionAutoNegotiate(); - @DefaultStringValue("V3") + @DefaultStringValue("V3 (default)") String nfsVersion3(); @DefaultStringValue("V4") -- To view, visit http://gerrit.ovirt.org/8242 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I831ecc7050a5487d5365efb94342a3c170dddc6c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
