Vojtech Szocs has submitted this change and it was merged. Change subject: webadmin,engine : fix geo-rep issues ...................................................................... webadmin,engine : fix geo-rep issues This patch fixes the following: 1. Fix column width for long geo-rep config descriptions makes use of ScrollableTextCell. 2. Defaults use_meta_volume to false (changing the order of allowed options as false;true) so that when user wants to set it to true the change is detected by UI as an attempt to set/reset an option.UI assumes the selection to be the first element in list if explictly selectedItem is not passed This appears as supposed be UI fix. But, a. the configs are set as a list in the table So, conditional handling of only this element in list correspoding to the table might not be a better idea. 3. Refactored geo-rep crawl status enum as per current geo-rep session status o/p.Earlier cli used to return Changelog_Crawl and now its changed to Changelog Crawl. 4. Fix UI NPE in updating geo-rep config occuring during new changes detection.This started appearing after introducing the changes to the query to display even those configs that were not listed by cli as the user has no other option to set/ reset them. With this change in query the UI would catch NPE as the set of configs not shown by cli have null value against the config key and during comparison to detect change, NPE used to occur. 5. Fix availability of remove session when session is anything other than Stopped. 6. If the config is reset from cli or from engine, and sync of config is attempted, some of them don't appear in the config list(if the config doesn't have a value), such configs' value need to be reset from db as well. Change-Id: Ie0bb13c54649ce2980e15b36ed363161b8ab679e Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1232611 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1233165 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1232699 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1233171 Signed-off-by: Anmol Babu <anbabu@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterGeoRepSyncJob.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetDefaultGeoRepConfigCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GeoRepCrawlStatus.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeGeoRepSessionDetailsPopUpView.java A packaging/dbscripts/upgrade/03_06_1630_update_config_option.sql 9 files changed, 55 insertions(+), 24 deletions(-) Approvals: Eli Mesika: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests anmolbabu: Verified Vojtech Szocs: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/42459 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0bb13c54649ce2980e15b36ed363161b8ab679e Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anbabu@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N <rnachimu@redhat.com> Gerrit-Reviewer: Sahina Bose <sabose@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com> Gerrit-Reviewer: anmolbabu <anbabu@redhat.com> Gerrit-Reviewer: automation@ovirt.org