rhq-commits August 2013

rhq-commits@lists.fedorahosted.org

13 participants
245 discussions

[rhq] Branch 'feature/bundle-gui' - modules/enterprise
by mazz 15 Aug '13

15 Aug '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 4 ++-- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 2 ++ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 2 ++ 9 files changed, 18 insertions(+), 2 deletions(-) New commits: commit 3ce64fa6a61dd3e0bea692bbc7737caf05d885c1 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Aug 15 11:31:11 2013 -0400 i18n the unassigned tree node label diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java index fbfa34c..d7f0220 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java @@ -109,8 +109,8 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { public void onSuccess(PageList<Bundle> result) { BundleGroup unassignedBundleGroup = new BundleGroup(); unassignedBundleGroup.setId(0); // ID=0 is an indicator we use to denote the unassigned group - unassignedBundleGroup.setName("TODO i18n Unassigned Bundles"); - unassignedBundleGroup.setDescription("TODO i18n These are bundles that are not assigned to any bundle group."); + unassignedBundleGroup.setName(MSG.view_bundle_tree_unassigned_name()); + unassignedBundleGroup.setDescription(MSG.view_bundle_tree_unassigned_desc()); // Because findBundleGroupsByCriteria would not have given us all unassigned bundles, we used // findBundlesByCriteria. But we need to organize our tree structure with groups at the top, so diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 6f6e30e..15af496 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1362,6 +1362,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = Failed to schedule revert view_bundle_revertWizard_title = Bundle Revert view_bundle_revertWizard_windowTitle = Bundle Revert Wizard view_bundle_tree_loadFailure = Failed to load bundle data +view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = Back to Bundle view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 72c70a3..a7b5903 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1375,6 +1375,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = Nepodařilo se naplánova view_bundle_revertWizard_title = Vrácení balíku view_bundle_revertWizard_windowTitle = Průvodce vrácení balíku view_bundle_tree_loadFailure = Nepodařilo se načíst data balíku +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = Zpět na balík view_bundle_version_bundleVersionTagUpdateFailure = Nepodařilo se změnit tagy pro verzi balíku view_bundle_version_bundleVersionTagUpdateSuccessful = Úspěšně jste změnili tagy pro verzi balíku diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 099c61e..658588f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -1266,6 +1266,8 @@ view_bundle_revert = Zurückrollen ##view_bundle_revertWizard_title = Bundle Revert ##view_bundle_revertWizard_windowTitle = Bundle Revert Wizard ##view_bundle_tree_loadFailure = Failed to load bundle data +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = Zurück zum Bundle ##view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags ##view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 64f8f3d..5fedff7 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1353,6 +1353,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = デプロイの取り消 view_bundle_revertWizard_title = バンドル取り消し view_bundle_revertWizard_windowTitle = バンドル取り消しウィザード view_bundle_tree_loadFailure = バンドルデータのロードに失敗しました +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = バンドルへ戻る view_bundle_version_bundleVersionTagUpdateFailure = バンドルバージョンタグの更新に失敗しました view_bundle_version_bundleVersionTagUpdateSuccessful = バンドルバージョンタグの更新に成功しました diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index c23a937..72b02ed 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -1203,6 +1203,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = 배포 취소 일정에 view_bundle_revertWizard_title = 번들 취소 view_bundle_revertWizard_windowTitle = 번들 취소 마법사 view_bundle_tree_loadFailure = 번들 데이터 로드에 실패했습니다 +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = 뒤로 가기 view_bundle_version_deleteFailure = 번들 버전 [{0}]을 삭제하는데 실패했습니다 view_bundle_version_deleteSuccessful = 번들 버전 [{0}]을 삭제하는데 성공했습니다 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 37b3277..bf49b55 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1364,6 +1364,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = Falha ao agendar a revers view_bundle_revertWizard_title = Revers\u00E3o do Bundle view_bundle_revertWizard_windowTitle = Assistente de revers\u00E3o do Bundle view_bundle_tree_loadFailure = Falha ao carregar dados do Bundle +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = Retornar ao Bundle view_bundle_version_bundleVersionTagUpdateFailure = Falha ao atualizar as tags da vers\u00E3o do bundle view_bundle_version_bundleVersionTagUpdateSuccessful = Tags da vers\u00E3o do bundle atualizadas com sucesso! diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 6b44762..8c82393 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2761,6 +2761,8 @@ view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_bundle_list_deletesFailure = Failed to delete the bundles ##view_bundle_list_deletesSuccessful = You successfully deleted the bundles ##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT To] {1} +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name ##view_configEdit_description = Description ##view_configEdit_property = Vlastnost ##view_configEdit_unset = Unset? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index eb163d6..fa98ec0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1349,6 +1349,8 @@ view_bundle_revertWizard_revertStep_scheduledFailure = Failed to schedule revert view_bundle_revertWizard_title = Bundle\u8fd8\u539f view_bundle_revertWizard_windowTitle = Bundle\u8fd8\u539f\u5411\u5bfc view_bundle_tree_loadFailure = \u52a0\u8f7dbundle\u6570\u636e\u5931\u8d25 +##view_bundle_tree_unassigned_desc = These are bundles that are not yet associated with any bundle group. +##view_bundle_tree_unassigned_name = Unassigned Name view_bundle_version_backToBundle = \u8fd4\u56deBundle view_bundle_version_bundleVersionTagUpdateFailure = \u66f4\u65b0bundle\u7248\u672c\u6807\u8bb0\u5931\u8d25 view_bundle_version_bundleVersionTagUpdateSuccessful = \u66f4\u65b0bundle\u7248\u672c\u6807\u8bb0\u6210\u529f

1 0

[rhq] 2 commits - modules/enterprise
by lkrejci 15 Aug '13

15 Aug '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 114 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 10 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 47 -- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 199 ++++++++-- modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 16 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 41 ++ modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 181 ++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 25 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 23 - 11 files changed, 529 insertions(+), 134 deletions(-) New commits: commit 7b3df20a5ebf5a78f90d6b87090098c324334ef4 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Aug 15 13:09:14 2013 +0200 Clean up after the test. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java index 46f2bef..1d6b49a 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java @@ -4,6 +4,8 @@ import static java.util.Arrays.asList; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -18,6 +20,7 @@ import org.rhq.core.domain.alert.AlertDampening; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.BooleanExpression; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.bundle.BundleType; import org.rhq.core.domain.bundle.ResourceTypeBundleConfiguration; @@ -54,6 +57,9 @@ import org.rhq.enterprise.server.util.LookupUtil; public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { private static final String PLUGIN_NAME = "ResourceMetadataManagerBeanTestPlugin"; + //this is used in afterclass, which might execute with a different instance than the rest of the tests + //therefore we need to make this static. Not sure who causes this, if it is Arq or TestNG itself. + private static Set<Integer> groupIds = Collections.synchronizedSet(new HashSet<Integer>()); @Test(groups = { "plugin.resource.metadata.test", "NewPlugin" }) public void testRemovalOfObsoleteBundleAndDriftConfig() throws Exception { @@ -607,9 +613,16 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { } // this needs to be the last test executed in the class, it does cleanup - @Test(priority = 10, alwaysRun = true, dependsOnGroups = { "RemoveTypes" }) + @Test(priority = 1000, alwaysRun = true, dependsOnGroups = { "RemoveTypes" }) public void afterClassWorkTest() throws Exception { afterClassWork(); + + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ResourceGroupManagerLocal groupManager = LookupUtil.getResourceGroupManager(); + + for(int id : groupIds) { + groupManager.deleteResourceGroup(overlord, id); + } } void assertTypesPersisted(String msg, List<String> types, String plugin) { @@ -714,6 +727,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest { ResourceGroup resourceGroup = new ResourceGroup(groupName, resourceType); resourceGroup.setRecursive(recursive); ResourceGroup result = resourceGroupMgr.createResourceGroup(subjectMgr.getOverlord(), resourceGroup); + groupIds.add(result.getId()); return result; } commit 0f0f307b2696819722a16fe84e27e5b51bd66390 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Aug 15 13:08:45 2013 +0200 [BZ 988881] - GUI now refreshes availability every 15s. Getting the live availability or live value of a metric now triggers alerts. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java index 3248186..eb0e85b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java @@ -26,6 +26,7 @@ import com.google.gwt.user.client.rpc.RemoteService; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.DeleteResourceHistory; @@ -69,6 +70,8 @@ public interface ResourceGWTService extends RemoteService { ResourceAvailabilitySummary getResourceAvailabilitySummary(int resourceId) throws RuntimeException; + ResourceAvailability getLiveResourceAvailability(int resourceId) throws RuntimeException; + PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria) throws RuntimeException; List<Resource> findResourcesByCriteriaBounded(ResourceCriteria criteria, int maxResources, int maxResourcesByType) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java index b214edc..b46e075 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java @@ -169,7 +169,7 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { @Override public void refresh() { super.refresh(); - this.titleBar.refresh(); + this.titleBar.refreshResourceErrors(); } private void popupDetails(String details) { @@ -188,7 +188,7 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { winModal.addCloseClickHandler(new CloseClickHandler() { public void onCloseClick(CloseClickEvent event) { winModal.markForDestroy(); - titleBar.refresh(); + titleBar.refreshResourceErrors(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java index 85dde83..fbbf0a8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java @@ -23,9 +23,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.Cursor; import com.smartgwt.client.types.VerticalAlignment; +import com.smartgwt.client.widgets.Button; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; @@ -33,13 +36,13 @@ import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.events.DoubleClickEvent; -import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.SpacerItem; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceError; @@ -53,6 +56,9 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView; import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; +import org.rhq.enterprise.gui.coregui.client.util.async.Command; +import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -74,6 +80,8 @@ public class ResourceTitleBar extends EnhancedVLayout { private static final String COLLAPSED_TOOLTIP = MSG.view_portlet_inventory_tooltip_expand(); private static final String EXPANDED_TOOLTIP = MSG.view_portlet_inventory_tooltip_collapse(); private static final String PLUGIN_ERRORS_ICON = "[SKIN]/Dialog/warn.png"; + private static final String LOADING_ICON = "ajax-loader.gif"; + private Img expandCollapseArrow; private Resource resource; @@ -87,6 +95,14 @@ public class ResourceTitleBar extends EnhancedVLayout { private EnhancedHLayout detailsForm; private OverviewForm detailsFormSummary; private Img pluginErrors; + private Img loading; + + private Timer resourceAvailAndErrorsRefreshTime = new Timer() { + @Override + public void run() { + refreshAvailAndResourceErrors(); + } + }; public ResourceTitleBar() { super(); @@ -116,14 +132,9 @@ public class ResourceTitleBar extends EnhancedVLayout { this.title.setWidth("*"); this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24, 24); - this.availabilityImage.addDoubleClickHandler(new DoubleClickHandler() { - public void onDoubleClick(DoubleClickEvent event) { - refresh(); - } - }); this.favoriteButton = new Img(NOT_FAV_ICON, 24, 24); - + this.favoriteButton.setCursor(Cursor.POINTER); this.favoriteButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { Set<Integer> favorites = toggleFavoriteLocally(); @@ -179,7 +190,6 @@ public class ResourceTitleBar extends EnhancedVLayout { pluginErrors = new Img(PLUGIN_ERRORS_ICON, 24, 24); pluginErrors.setVisible(false); - refreshPluginErrors(); // this is an async call //define tool tip pluginErrors.setPrompt(MSG.view_resource_title_component_errors_tooltip()); @@ -227,10 +237,15 @@ public class ResourceTitleBar extends EnhancedVLayout { } }); + loading = new Img(LOADING_ICON, 16, 16); + loading.setVisible(false); + loading.setValign(VerticalAlignment.CENTER); + //top information top.addMember(expandCollapseArrow); top.addMember(badge); top.addMember(title); + top.addMember(loading); top.addMember(pluginErrors); top.addMember(availabilityImage); top.addMember(favoriteButton); @@ -267,6 +282,17 @@ public class ResourceTitleBar extends EnhancedVLayout { } addMember(details); ResourceTitleBar.this.markForRedraw(); + + resourceAvailAndErrorsRefreshTime.scheduleRepeating(15000); + } + + @Override + protected void onUnload() { + if (resourceAvailAndErrorsRefreshTime != null) { + resourceAvailAndErrorsRefreshTime.cancel(); + } + + super.onUnload(); } private void loadTags(final TagEditorView tagEditorView) { @@ -344,11 +370,27 @@ public class ResourceTitleBar extends EnhancedVLayout { return favorites; } - public void refresh() { - refreshPluginErrors(); + public void refreshResourceErrors() { + refreshErrors(null); + } + + public void refreshAvailAndResourceErrors() { + CountDownLatch latch = CountDownLatch.create(2, new Command() { + @Override + public void execute() { + loading.setVisible(false); + markForRedraw(); + } + }); + + loading.setVisible(true); + loading.markForRedraw(); + + refreshAvailability(latch); + refreshErrors(latch); } - private void refreshPluginErrors() { + private void refreshErrors(final CountDownLatch latch) { GWTServiceLookup.getResourceService().findResourceErrors(resourceComposite.getResource().getId(), new AsyncCallback<List<ResourceError>>() { public void onFailure(Throwable caught) { @@ -356,15 +398,59 @@ public class ResourceTitleBar extends EnhancedVLayout { CoreGUI.getErrorHandler().handleError( MSG.dataSource_resourceErrors_error_fetchFailure(String.valueOf(resourceComposite.getResource() .getId())), caught); + + if (latch != null) { + latch.countDown(); + } else { + markForRedraw(); + } } public void onSuccess(List<ResourceError> result) { pluginErrors.setVisible(!result.isEmpty()); - markForRedraw(); + + if (latch != null) { + latch.countDown(); + } else { + markForRedraw(); + } } }); } + private void refreshAvailability(final CountDownLatch latch) { + final AvailabilityType currentAvail = resource.getCurrentAvailability().getAvailabilityType(); + + GWTServiceLookup.getResourceService().getLiveResourceAvailability(resource.getId(), + new AsyncCallback<ResourceAvailability>() { + + @Override + public void onFailure(Throwable caught) { + availabilityImage.setSrc(ImageManager.getAvailabilityLargeIconFromAvailType(currentAvail)); + CoreGUI.getErrorHandler().handleError("I18N: Failed to refresh the availability", caught); + //MSG.dataSource_resourceErrors_error_fetchFailure(String.valueOf(resourceComposite.getResource() + // .getId())), caught); + if (latch != null) { + latch.countDown(); + } else { + markForRedraw(); + } + } + + @Override + public void onSuccess(ResourceAvailability result) { + availabilityImage.setSrc(ImageManager.getAvailabilityLargeIconFromAvailType(result.getAvailabilityType())); + resource.setCurrentAvailability(result); + availabilityImage.markForRedraw(); + if (latch != null) { + latch.countDown(); + } else { + markForRedraw(); + } + } + }); + } + public class UpdateFavoritesCallback implements AsyncCallback<Subject> { public void onSuccess(Subject subject) { String msg = null; @@ -391,4 +477,4 @@ public class ResourceTitleBar extends EnhancedVLayout { } } -} \ No newline at end of file +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java index dfa1b9f..fbf5d7b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java @@ -33,6 +33,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.CannotConnectToAgentException; import org.rhq.core.domain.resource.CreateResourceHistory; @@ -135,6 +136,15 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re } } + @Override + public ResourceAvailability getLiveResourceAvailability(int resourceId) throws RuntimeException { + try { + return SerialUtility.prepare(resourceManager.getLiveResourceAvailability(getSessionSubject(), resourceId), "ResourceService.getLiveResourceAvailability"); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + public PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria) throws RuntimeException { try { PageList<Resource> result = resourceManager.findResourcesByCriteria(getSessionSubject(), criteria); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java index 3797542..153cc3d 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java @@ -23,8 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.NoResultException; - import org.testng.Assert; import org.testng.annotations.Test; @@ -38,7 +36,6 @@ import org.rhq.core.domain.alert.AlertDampening.Category; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.BooleanExpression; -import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.discovery.AvailabilityReport; @@ -49,7 +46,6 @@ import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageControl; @@ -69,12 +65,7 @@ import org.rhq.enterprise.server.util.LookupUtil; public class AlertConditionTest extends UpdatePluginMetadataTestBase { private static final boolean ENABLED = true; - // this must match the constant found in ServerManagerBean - private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name"; - private static final String RHQ_SERVER_NAME_PROPERTY_VALUE = "AlertConditionTestServer"; - private Resource resource; - private Server server; @Override protected String getSubsystemDirectory() { @@ -82,22 +73,12 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase { } @Override - protected void beforeMethod() throws Exception { - super.beforeMethod(); - System.setProperty(RHQ_SERVER_NAME_PROPERTY, RHQ_SERVER_NAME_PROPERTY_VALUE); - } - - @Override protected void afterMethod() throws Exception { if (resource != null) { deleteNewResource(resource); resource = null; } - deleteServerIdentity(); - - System.setProperty(RHQ_SERVER_NAME_PROPERTY, ""); - super.afterMethod(); } @@ -661,32 +642,4 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase { LookupUtil.getAlertConditionCacheManager().reloadAllCaches(); } - private void createServerIdentity() { - server = new Server(); - server.setName(RHQ_SERVER_NAME_PROPERTY_VALUE); - server.setAddress("localhost"); - server.setPort(7080); - server.setSecurePort(7443); - server.setComputePower(1); - server.setOperationMode(Server.OperationMode.MAINTENANCE); - int serverId = LookupUtil.getServerManager().create(server); - assert serverId > 0 : "could not create our server identity in the DB"; - - // simulate the agent being "connected" to the server - try { - Agent agent = getAgent(); - agent.setServer(server); - LookupUtil.getAgentManager().updateAgent(agent); - } catch (NoResultException nre) { - // no agent to attach - } - } - - private void deleteServerIdentity() throws Exception { - if (server != null) { - cleanupAgent(); // can't remove the server before we purge the agent - LookupUtil.getTopologyManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId()); - server = null; - } - } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java index 9f49143..dbd03ae 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java @@ -34,8 +34,11 @@ import static org.rhq.test.AssertUtils.assertPropertiesMatch; import java.math.BigDecimal; import java.math.MathContext; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.ejb.EJB; @@ -43,12 +46,30 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.joda.time.DateTime; import org.joda.time.Hours; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.testng.annotations.Test; +import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService; +import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertCondition; +import org.rhq.core.domain.alert.AlertConditionCategory; +import org.rhq.core.domain.alert.AlertConditionOperator; +import org.rhq.core.domain.alert.AlertDampening; +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.alert.AlertPriority; +import org.rhq.core.domain.alert.BooleanExpression; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.common.EntityContext; +import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementAggregate; +import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDataNumeric; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementReport; @@ -56,14 +77,18 @@ import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; import org.rhq.core.domain.resource.Agent; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.drift.DriftServerPluginService; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TestServerCommunicationsService; import org.rhq.enterprise.server.test.TransactionCallback; +import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.enterprise.server.util.ResourceTreeHelper; import org.rhq.server.metrics.MetricsDAO; import org.rhq.server.metrics.StorageSession; @@ -77,6 +102,10 @@ import org.rhq.test.AssertUtils; */ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { + // this must match the constant found in ServerManagerBean + private static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name"; + private static final String RHQ_SERVER_NAME_PROPERTY_VALUE = "TestServer"; + //private final Log log = LogFactory.getLog(MeasurementDataManagerBeanTest.class); private static final boolean ENABLED = true; @@ -101,6 +130,8 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { private ResourceType resourceType; + private Server server; + private Agent agent; private MeasurementDefinition dynamicMeasuremenDef; @@ -109,7 +140,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { private MeasurementSchedule dynamicSchedule; - private Subject overlord; + private AlertDefinition alertDefinition; @EJB private SubjectManagerLocal subjectManager; @@ -125,9 +156,17 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { private MetricsDAO metricsDAO; + private TestServerCommunicationsService agentServiceContainer; + + private Subject getOverlord() { + return subjectManager.getOverlord(); + } + @Override protected void beforeMethod() throws Exception { - overlord = subjectManager.getOverlord(); + agentServiceContainer = prepareForTestAgents(); + + prepareScheduler(); metricsDAO = storageClientManager.getMetricsDAO(); @@ -137,15 +176,21 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { prepareCustomServerPluginService(driftServerPluginService); driftServerPluginService.masterConfig.getPluginDirectory().mkdirs(); + System.setProperty(RHQ_SERVER_NAME_PROPERTY, RHQ_SERVER_NAME_PROPERTY_VALUE); + createInventory(); insertDummyReport(); + + agentServiceContainer.addStartedAgent(agent); } @Override protected void afterMethod() throws Exception { - purgeDB(); + purgeDB(true); unprepareServerPluginService(); + unprepareScheduler(); + unprepareForTestAgents(); } @Test(enabled = ENABLED) @@ -168,7 +213,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { dataManager.mergeMeasurementReport(report); waitForRawInserts(); - List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(overlord, + List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(getOverlord(), EntityContext.forResource(resource.getId()), dynamicSchedule, beginTime.getMillis(), endTime.getMillis()); assertEquals("Expected to get back 60 data points.", buckets.getNumDataPoints(), actualData.size()); @@ -213,7 +258,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { dataManager.mergeMeasurementReport(report); waitForRawInserts(); - MeasurementAggregate actual = dataManager.getAggregate(overlord, dynamicSchedule.getId(), + MeasurementAggregate actual = dataManager.getAggregate(getOverlord(), dynamicSchedule.getId(), beginTime.getMillis(), endTime.getMillis()); MeasurementAggregate expected = new MeasurementAggregate(1.1, divide((1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6), 6), @@ -244,7 +289,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { insert1HourData(data); - List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(overlord, + List<MeasurementDataNumericHighLowComposite> actualData = findDataForContext(getOverlord(), EntityContext.forResource(resource.getId()), dynamicSchedule, beginTime.getMillis(), endTime.getMillis()); assertEquals("Expected to get back 60 data points.", buckets.getNumDataPoints(), actualData.size()); @@ -260,8 +305,50 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { actualData.get(59), 0.0001D); } + @Test(enabled = ENABLED) + public void gettingLiveDataTriggersAlerts() throws Exception { + agentServiceContainer.measurementService = Mockito.mock(MeasurementAgentService.class); + + Mockito.when(agentServiceContainer.measurementService.getRealTimeMeasurementValue(Mockito.anyInt(), Mockito.anySetOf(MeasurementScheduleRequest.class))).then( + new Answer<Set<MeasurementData>>() { + @Override + @SuppressWarnings("unchecked") + public Set<MeasurementData> answer(InvocationOnMock invocation) throws Throwable { + Set<MeasurementScheduleRequest> requests = (Set<MeasurementScheduleRequest>) invocation.getArguments()[1]; + + Set<MeasurementData> ret = new HashSet<MeasurementData>(); + for(MeasurementScheduleRequest req : requests) { + ret.add(new MeasurementDataNumeric(System.currentTimeMillis(), req, (double) System.nanoTime())); + } + + return ret; + } + }); + + dataManager.findLiveData(getOverlord(), resource.getId(), new int[] { dynamicMeasuremenDef.getId()}, Long.MAX_VALUE); + // wait for our JMS messages to process and see if we get any alerts + Thread.sleep(3000); + + //need to do this so that we don't have to wait on server's heartbeat to propagate the + //collected value into the alert condition cache + LookupUtil.getAlertConditionCacheManager().reloadAllCaches(); + + //this first metric collection doesn't trigger alerts because there's no "history" to compare against + //let's trigger another metric collection so that we see the alert fire... + dataManager.findLiveData(getOverlord(), resource.getId(), new int[] { dynamicMeasuremenDef.getId()}, Long.MAX_VALUE); + // wait for our JMS messages to process and see if we get any alerts + Thread.sleep(3000); + + //check that the alert fired when the value of the measurement changed. + AlertCriteria aCrit = new AlertCriteria(); + aCrit.addFilterResourceIds(resource.getId()); + + List<Alert> alerts = LookupUtil.getAlertManager().findAlertsByCriteria(getOverlord(), aCrit); + assertEquals("Unexpected number of alerts on the resource.", 1, alerts.size()); + } + private void createInventory() throws Exception { - purgeDB(); + purgeDB(false); executeInTransaction(false, new TransactionCallback() { @Override public void execute() throws Exception { @@ -269,7 +356,18 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { resourceType = new ResourceType(RESOURCE_TYPE, PLUGIN, SERVER, null); em.persist(resourceType); + server = new Server(); + server.setName(RHQ_SERVER_NAME_PROPERTY_VALUE); + server.setAddress("localhost"); + server.setPort(7080); + server.setSecurePort(7443); + server.setComputePower(1); + server.setOperationMode(Server.OperationMode.MAINTENANCE); + int serverId = LookupUtil.getServerManager().create(server); + assert serverId > 0 : "could not create our server identity in the DB"; + agent = new Agent(AGENT_NAME, "localhost", 9999, "", "randomToken"); + agent.setServer(server); em.persist(agent); dynamicMeasuremenDef = new MeasurementDefinition(resourceType, DYNAMIC_DEF_NAME); @@ -281,6 +379,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { resource = new Resource(RESOURCE_KEY, RESOURCE_NAME, resourceType); resource.setUuid(RESOURCE_UUID); + resource.setInventoryStatus(InventoryStatus.COMMITTED); resource.setAgent(agent); em.persist(resource); @@ -292,29 +391,65 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { em.persist(dynamicSchedule); } }); + + alertDefinition = new AlertDefinition(); + AlertCondition cond = new AlertCondition(alertDefinition, AlertConditionCategory.CHANGE); + cond.setName(DYNAMIC_DEF_NAME); + cond.setMeasurementDefinition(dynamicMeasuremenDef); + alertDefinition.setName("liveDataTestAlert"); + alertDefinition.setResource(resource); + alertDefinition.setPriority(AlertPriority.MEDIUM); + alertDefinition.setRecoveryId(0); + alertDefinition.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE)); + alertDefinition.setConditions(Collections.singleton(cond)); + alertDefinition.setEnabled(true); + alertDefinition.setConditionExpression(BooleanExpression.ALL); + + AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); + //needs to be done outside of the above transaction, so that the createAlert... method can "see" the resource. + alertDefinitionManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDefinition, resource.getId(), true); + + //obvious, right? This needs to be done for the alert subsystem to become aware of the new def + LookupUtil.getAlertConditionCacheManager().reloadAllCaches(); } - private void purgeDB() { + private void purgeDB(final boolean assumeResourceExists) { purgeMetricsTables(); + ResourceCriteria c = new ResourceCriteria(); + c.addFilterInventoryStatus(null); + c.addFilterResourceKey(RESOURCE_KEY); + c.fetchSchedules(true); + c.fetchAlertDefinitions(true); + + final List<Resource> r = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), c); + if (assumeResourceExists && !r.isEmpty()) { + assertTrue("Should be only 1 resource", r.size() == 1); + } + + if (!r.isEmpty()) { + Resource doomedResource = r.get(0); + deleteAlertDefinitions(doomedResource.getAlertDefinitions()); + } + executeInTransaction(false, new TransactionCallback() { @Override public void execute() throws Exception { - ResourceCriteria c = new ResourceCriteria(); - c.addFilterInventoryStatus(null); - c.addFilterResourceKey(RESOURCE_KEY); - c.fetchSchedules(true); - List<Resource> r = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), c); - - // Note that the order of deletes is important due to FK - // constraints. + if (!r.isEmpty()) { - assertTrue("Should be only 1 resource", r.size() == 1); - Resource doomedResource = r.get(0); - deleteMeasurementSchedules(doomedResource); - deleteResource(doomedResource); + //load the resource entity again within this transaction so that we + //have an attached copy of it. + Resource delete = em.find(Resource.class, r.get(0).getId()); + + + // Note that the order of deletes is important due to FK + // constraints. + deleteMeasurementSchedules(delete); + deleteResource(delete); } + deleteAgent(); + deleteServer(); deleteDynamicMeasurementDef(); deleteResourceType(); } @@ -330,6 +465,10 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { em.createQuery("delete from Agent where name = :name").setParameter("name", AGENT_NAME).executeUpdate(); } + private void deleteServer() { + em.createQuery("delete from Server where name = :name").setParameter("name", RHQ_SERVER_NAME_PROPERTY_VALUE).executeUpdate(); + } + private void deleteResourceType() { em.createQuery("delete from ResourceType where name = :name and plugin = :plugin") .setParameter("name", RESOURCE_TYPE).setParameter("plugin", PLUGIN).executeUpdate(); @@ -349,6 +488,26 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test { } } + private void deleteAlertDefinitions(Collection<AlertDefinition> defs) { + AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); + + int[] ids = new int[defs.size()]; + int i = 0; + for(AlertDefinition def : defs) { + ids[i++] = def.getId(); + + LookupUtil.getAlertManager() + .deleteAlertsByContext(getOverlord(), EntityContext.forResource(def.getResource().getId())); + } + + alertDefinitionManager.removeAlertDefinitions(getOverlord(), ids); + + alertDefinitionManager.purgeUnusedAlertDefinitions(); + for(i = 0; i < ids.length; ++i) { + alertDefinitionManager.purgeInternals(ids[i]); + } + } + private void insertDummyReport() { // we insert the dummy report due to https://bugzilla.redhat.com/show_bug.cgi?id=822240 DateTime now = new DateTime(); diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java index ac4ba79..abdc281 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java @@ -38,6 +38,7 @@ import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; import org.rhq.core.clientapi.descriptor.DescriptorPackages; import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.measurement.MeasurementData; @@ -61,6 +62,10 @@ import org.rhq.enterprise.server.util.LookupUtil; public class UpdatePluginMetadataTestBase extends AbstractEJB3Test { + // this must match the constant found in ServerManagerBean + protected static final String RHQ_SERVER_NAME_PROPERTY = "rhq.server.high-availability.name"; + protected static final String RHQ_SERVER_NAME_PROPERTY_VALUE = "TestServer"; + protected TestServerCommunicationsService agentServiceContainer; protected static final String PLUGIN_NAME = "UpdatePluginMetadataTestBasePlugin"; // don't change this - our test descriptor .xml files use it as plugin name @@ -70,6 +75,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test { protected static PluginManagerLocal pluginMgr; protected static ResourceTypeManagerLocal resourceTypeManager; protected static ResourceManagerLocal resourceManager; + private Server server; @Override protected void beforeMethod() throws Exception { @@ -86,6 +92,8 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test { pluginMgr = LookupUtil.getPluginManager(); resourceTypeManager = LookupUtil.getResourceTypeManager(); resourceManager = LookupUtil.getResourceManager(); + + System.setProperty(RHQ_SERVER_NAME_PROPERTY, RHQ_SERVER_NAME_PROPERTY_VALUE); } @Override @@ -96,6 +104,10 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test { unpreparePluginScannerService(); unprepareScheduler(); unprepareForTestAgents(); + + deleteServerIdentity(); + + System.setProperty(RHQ_SERVER_NAME_PROPERTY, ""); } protected void prepareMockAgentServiceContainer() { @@ -261,6 +273,35 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test { agentServiceContainer.addStartedAgent(agent); } + protected void createServerIdentity() { + server = new Server(); + server.setName(RHQ_SERVER_NAME_PROPERTY_VALUE); + server.setAddress("localhost"); + server.setPort(7080); + server.setSecurePort(7443); + server.setComputePower(1); + server.setOperationMode(Server.OperationMode.MAINTENANCE); + int serverId = LookupUtil.getServerManager().create(server); + assert serverId > 0 : "could not create our server identity in the DB"; + + // simulate the agent being "connected" to the server + try { + Agent agent = getAgent(); + agent.setServer(server); + LookupUtil.getAgentManager().updateAgent(agent); + } catch (NoResultException nre) { + // no agent to attach + } + } + + protected void deleteServerIdentity() throws Exception { + if (server != null) { + cleanupAgent(); // can't remove the server before we purge the agent + LookupUtil.getTopologyManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId()); + server = null; + } + } + /** * A dummy that needs to be set up before running ResourceManager.deleteResource() */ diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java index 1fbeb3c..660afed 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java @@ -18,17 +18,40 @@ */ package org.rhq.enterprise.server.resource.test; +import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Random; import java.util.UUID; import javax.transaction.NotSupportedException; import javax.transaction.SystemException; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.testng.annotations.Test; +import org.jboss.remoting.InvokerLocator; + +import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService; +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertCondition; +import org.rhq.core.domain.alert.AlertConditionCategory; +import org.rhq.core.domain.alert.AlertConditionOperator; +import org.rhq.core.domain.alert.AlertDampening; +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.alert.AlertPriority; +import org.rhq.core.domain.alert.BooleanExpression; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.MeasurementDefinition; +import org.rhq.core.domain.measurement.ResourceAvailability; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; @@ -39,8 +62,13 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.communications.ServiceContainer; +import org.rhq.enterprise.communications.command.server.CommandProcessorMetrics; +import org.rhq.enterprise.server.agentclient.AgentClient; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; import org.rhq.enterprise.server.auth.SessionManager; import org.rhq.enterprise.server.auth.SessionNotFoundException; +import org.rhq.enterprise.server.core.comm.ServerConfiguration; import org.rhq.enterprise.server.discovery.DiscoveryServerServiceImpl; import org.rhq.enterprise.server.operation.OperationDefinitionNotFoundException; import org.rhq.enterprise.server.resource.ResourceManagerLocal; @@ -51,6 +79,7 @@ import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionNotFoundException; import org.rhq.enterprise.server.resource.metadata.test.UpdatePluginMetadataTestBase; import org.rhq.enterprise.server.test.TestServerCommunicationsService; +import org.rhq.enterprise.server.test.TestServerCommunicationsServiceMBean; import org.rhq.enterprise.server.util.LookupUtil; /** @@ -58,39 +87,25 @@ import org.rhq.enterprise.server.util.LookupUtil; */ @Test public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { - private Subject overlord; private Resource newResource; private ResourceGroup newGroup; private ResourceGroupManagerLocal groupManager; - TestServerCommunicationsService agentServiceContainer; - @Override protected void beforeMethod() throws Exception { super.beforeMethod(); - overlord = LookupUtil.getSubjectManager().getOverlord(); newResource = createNewResourceWithNewType(); groupManager = LookupUtil.getResourceGroupManager(); newGroup = createNewGroup(); } - @Override - protected void afterMethod() throws Exception { - if (newGroup != null) { - groupManager.deleteResourceGroup(overlord, newGroup.getId()); - } - deleteNewResourceAgentResourceType(newResource); - - super.afterMethod(); - } - public void testResourceErrors() { ResourceError error; List<ResourceError> errors; DiscoveryServerServiceImpl serverService = new DiscoveryServerServiceImpl(); - errors = resourceManager.findResourceErrors(overlord, newResource.getId(), + errors = resourceManager.findResourceErrors(getOverlord(), newResource.getId(), ResourceErrorType.INVALID_PLUGIN_CONFIGURATION); assert errors.size() == 0; @@ -100,7 +115,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { // simulate the agent notifying the server about an error // this will exercise the addResourceError in the SLSB serverService.setResourceError(error); - errors = resourceManager.findResourceErrors(overlord, newResource.getId(), + errors = resourceManager.findResourceErrors(getOverlord(), newResource.getId(), ResourceErrorType.INVALID_PLUGIN_CONFIGURATION); assert errors.size() == 1; error = errors.get(0); @@ -118,7 +133,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { error.setSummary("another summary"); error.setDetail("another detail"); serverService.setResourceError(error); - errors = resourceManager.findResourceErrors(overlord, newResource.getId(), + errors = resourceManager.findResourceErrors(getOverlord(), newResource.getId(), ResourceErrorType.INVALID_PLUGIN_CONFIGURATION); assert errors.size() == 1; error = errors.get(0); @@ -128,12 +143,22 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { assert error.getErrorType() == ResourceErrorType.INVALID_PLUGIN_CONFIGURATION; assert error.getTimeOccurred() == 567890; - resourceManager.deleteResourceError(overlord, error.getId()); - errors = resourceManager.findResourceErrors(overlord, newResource.getId(), + resourceManager.deleteResourceError(getOverlord(), error.getId()); + errors = resourceManager.findResourceErrors(getOverlord(), newResource.getId(), ResourceErrorType.INVALID_PLUGIN_CONFIGURATION); assert errors.size() == 0; } + @Override + protected void afterMethod() throws Exception { + if (newGroup != null) { + groupManager.deleteResourceGroup(getOverlord(), newGroup.getId()); + } + deleteNewResourceAgentResourceType(newResource); + + super.afterMethod(); + } + public void testResourceLineage() throws Exception { // given a resource id for the leaf resource in a resource hierarchy int leafResourceId = givenASampleResourceHierarchy(); @@ -162,7 +187,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { // Make sure our application exceptions are not wrapped public void bz886850Test() { try { - resourceManager.getResourceById(overlord, 2637426); + resourceManager.getResourceById(getOverlord(), 2637426); fail("Should have thrown a ResourceNotFoundException"); } catch (Throwable t) { if (!(t instanceof ResourceNotFoundException)) { @@ -178,7 +203,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { } } try { - LookupUtil.getOperationManager().getOperationDefinition(overlord, 3456347); + LookupUtil.getOperationManager().getOperationDefinition(getOverlord(), 3456347); fail("Should have thrown a OperationDefinitionNotFoundException"); } catch (Throwable t) { if (!(t instanceof OperationDefinitionNotFoundException)) { @@ -186,7 +211,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { } } try { - LookupUtil.getResourceTypeManager().getResourceTypeById(overlord, 3456347); + LookupUtil.getResourceTypeManager().getResourceTypeById(getOverlord(), 3456347); fail("Should have thrown a ResourceTypeNotFoundException"); } catch (Throwable t) { if (!(t instanceof ResourceTypeNotFoundException)) { @@ -194,7 +219,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { } } try { - LookupUtil.getResourceGroupManager().getResourceGroup(overlord, 3456347); + LookupUtil.getResourceGroupManager().getResourceGroup(getOverlord(), 3456347); fail("Should have thrown a ResourceGroupNotFoundException"); } catch (Throwable t) { if (!(t instanceof ResourceGroupNotFoundException)) { @@ -215,7 +240,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.addFilterId(newGroup.getId()); criteria.fetchExplicitResources(true); - PageList<ResourceGroup> persistedGroups = groupManager.findResourceGroupsByCriteria(overlord, criteria); + PageList<ResourceGroup> persistedGroups = groupManager.findResourceGroupsByCriteria(getOverlord(), criteria); assertEquals("There should be just one group with id " + newGroup.getId(), 1, persistedGroups.size()); @@ -226,8 +251,8 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { .getExplicitResources().size()); // add resource to group - groupManager.addResourcesToGroup(overlord, newGroup.getId(), new int[] { newResource.getId() }); - persistedGroups = groupManager.findResourceGroupsByCriteria(overlord, criteria); + groupManager.addResourcesToGroup(getOverlord(), newGroup.getId(), new int[] { newResource.getId() }); + persistedGroups = groupManager.findResourceGroupsByCriteria(getOverlord(), criteria); assertEquals("There should be one member in the newly created group.", 1, persistedGroups.get(0).getExplicitResources() .size()); } @@ -237,41 +262,110 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { ResourceGroupCriteria criteria = new ResourceGroupCriteria(); criteria.addFilterId(newGroup.getId()); criteria.fetchExplicitResources(true); - PageList<ResourceGroup> persistedGroups = groupManager.findResourceGroupsByCriteria(overlord, criteria); + PageList<ResourceGroup> persistedGroups = groupManager.findResourceGroupsByCriteria(getOverlord(), criteria); assertEquals("There should be just one group with id " + newGroup.getId(), 1, persistedGroups.size()); assertEquals("An empty group is considered as MIXED.", GroupCategory.MIXED, persistedGroups.get(0) .getGroupCategory()); // add resource to group - groupManager.addResourcesToGroup(overlord, persistedGroups.get(0).getId(), new int[] { newResource.getId() }); - persistedGroups = groupManager.findResourceGroupsByCriteria(overlord, criteria); + groupManager.addResourcesToGroup(getOverlord(), persistedGroups.get(0).getId(), new int[] { newResource.getId() }); + persistedGroups = groupManager.findResourceGroupsByCriteria(getOverlord(), criteria); assertEquals("A group with just one explicit member is considered as COMPATIBLE.", GroupCategory.COMPATIBLE, persistedGroups.get(0).getGroupCategory()); // now uninventorize the only resource - resourceManager.uninventoryResource(overlord, newResource.getId()); - persistedGroups = groupManager.findResourceGroupsByCriteria(overlord, criteria); + resourceManager.uninventoryResource(getOverlord(), newResource.getId()); + persistedGroups = groupManager.findResourceGroupsByCriteria(getOverlord(), criteria); assertEquals("An empty group is considered as MIXED.", GroupCategory.MIXED, persistedGroups.get(0) .getGroupCategory()); } public void testResourceRemovalFromGroup() { - ResourceGroup persistedGroup = groupManager.getResourceGroup(overlord, newGroup.getId()); + ResourceGroup persistedGroup = groupManager.getResourceGroup(getOverlord(), newGroup.getId()); assertEquals("An empty group is considered as MIXED.", GroupCategory.MIXED, persistedGroup.getGroupCategory()); // add resource to group - groupManager.addResourcesToGroup(overlord, persistedGroup.getId(), new int[] { newResource.getId() }); - persistedGroup = groupManager.getResourceGroup(overlord, newGroup.getId()); + groupManager.addResourcesToGroup(getOverlord(), persistedGroup.getId(), new int[] { newResource.getId() }); + persistedGroup = groupManager.getResourceGroup(getOverlord(), newGroup.getId()); assertEquals("A group with just one explicit member is considered as COMPATIBLE.", GroupCategory.COMPATIBLE, persistedGroup.getGroupCategory()); // now remove the only resource from the group - groupManager.removeResourcesFromGroup(overlord, persistedGroup.getId(), new int[] { newResource.getId() }); - persistedGroup = groupManager.getResourceGroup(overlord, newGroup.getId()); + groupManager.removeResourcesFromGroup(getOverlord(), persistedGroup.getId(), new int[] { newResource.getId() }); + persistedGroup = groupManager.getResourceGroup(getOverlord(), newGroup.getId()); assertEquals("An empty group is considered as MIXED.", GroupCategory.MIXED, persistedGroup.getGroupCategory()); } + public void testLiveAvailability() throws Exception { + agentServiceContainer.discoveryService = Mockito.mock(DiscoveryAgentService.class); + + Mockito.when(agentServiceContainer.discoveryService.getCurrentAvailability(Mockito.any(Resource.class))).then( + new Answer<Availability>() { + int count = 0; + + @Override + public Availability answer(InvocationOnMock invocation) throws Throwable { + Resource res = (Resource) invocation.getArguments()[0]; + AvailabilityType avail = count++ == 0 ? AvailabilityType.DOWN : AvailabilityType.UP; + return new Availability(res, avail); + } + }); + + AlertDefinition alertDef = new AlertDefinition(); + + AlertCondition cond = new AlertCondition(alertDef, AlertConditionCategory.AVAILABILITY); + cond.setName(AlertConditionOperator.AVAIL_GOES_UP.name()); + alertDef.setName("liveAvailabilityTestAlert"); + alertDef.setResource(newResource); + alertDef.setPriority(AlertPriority.MEDIUM); + alertDef.setRecoveryId(0); + alertDef.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE)); + alertDef.setConditions(Collections.singleton(cond)); + alertDef.setEnabled(true); + alertDef.setConditionExpression(BooleanExpression.ALL); + + AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); + alertDefinitionManager.createAlertDefinitionInNewTransaction(getOverlord(), alertDef, newResource.getId(), true); + + //obvious, right? This needs to be done for the alert subsystem to become aware of the new def + LookupUtil.getAlertConditionCacheManager().reloadAllCaches(); + + ResourceCriteria crit = new ResourceCriteria(); + crit.addFilterId(newResource.getId()); + crit.fetchCurrentAvailability(true); + Resource fromDb = resourceManager.findResourcesByCriteria(getOverlord(), crit).get(0); + + assertEquals(AvailabilityType.UNKNOWN, fromDb.getCurrentAvailability().getAvailabilityType()); + + //ask for the live avail - the mock agent response will return "DOWN" the first time + resourceManager.getLiveResourceAvailability(getOverlord(), newResource.getId()); + + //check that the resource changed its avail in the db + fromDb = resourceManager.getResource(getOverlord(), newResource.getId()); + assertEquals(AvailabilityType.DOWN, fromDb.getCurrentAvailability().getAvailabilityType()); + + //ask for the live avail - the mock agent response will return "UP" the second time + resourceManager.getLiveResourceAvailability(getOverlord(), newResource.getId()); + + // wait for our JMS messages to process and see if we get any alerts + Thread.sleep(3000); + + //check that the resource changed its avail in the db + fromDb = resourceManager.getResource(getOverlord(), newResource.getId()); + assertEquals(AvailabilityType.UP, fromDb.getCurrentAvailability().getAvailabilityType()); + + // wait for our JMS messages to process and see if we get any alerts + Thread.sleep(3000); + + //check that the alert fired when going from DOWN to UP + AlertCriteria aCrit = new AlertCriteria(); + aCrit.addFilterResourceIds(newResource.getId()); + + List<Alert> alerts = LookupUtil.getAlertManager().findAlertsByCriteria(getOverlord(), aCrit); + assertEquals("Unexpected number of alerts on the resource.", 1, alerts.size()); + } + private int givenASampleResourceHierarchy() throws NotSupportedException, SystemException { getTransactionManager().begin(); @@ -339,15 +433,14 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { em.persist(resourceType); - Agent agent = new Agent("testagent", "testaddress", 16163, "", "testtoken"); - em.persist(agent); - em.flush(); - resource = new Resource("reskey" + System.currentTimeMillis(), "resname", resourceType); + setUpAgent(resource); + resource.setUuid("" + new Random().nextInt()); - resource.setAgent(agent); resource.setInventoryStatus(InventoryStatus.COMMITTED); em.persist(resource); + + createServerIdentity(); } catch (Exception e) { System.out.println("CANNOT PREPARE TEST: " + e); getTransactionManager().rollback(); @@ -361,7 +454,7 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { private ResourceGroup createNewGroup() { ResourceGroup group = new ResourceGroup("testGroup"); - groupManager.createResourceGroup(overlord, group); + groupManager.createResourceGroup(getOverlord(), group); return group; } @@ -372,9 +465,9 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase { try { Resource res = em.find(Resource.class, resource.getId()); System.out.println("Removing " + res + "..."); - List<Integer> deletedIds = resourceManager.uninventoryResource(overlord, res.getId()); + List<Integer> deletedIds = resourceManager.uninventoryResource(getOverlord(), res.getId()); for (Integer deletedResourceId : deletedIds) { - resourceManager.uninventoryResourceAsyncWork(overlord, deletedResourceId); + resourceManager.uninventoryResourceAsyncWork(getOverlord(), deletedResourceId); } em.flush(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java index 09133ae..3c1232d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java @@ -832,6 +832,11 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal, } } + if (result != null && !result.isEmpty()) { + //we just got data from the agent so let's push them through the alerting + pushToAlertSubsystem(result); + } + //[BZ 760139] always return non-null value even when there are errors on the server side. Avoids cryptic // Global UI Exceptions when attempting to serialize null responses. if (null == result) { @@ -881,6 +886,13 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal, } } } + + if (values != null && !values.isEmpty()) { + //we just got data from the agent so let's push them through the alerting + pushToAlertSubsystem(values); + } + + return values; } @@ -977,4 +989,17 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal, private MeasurementDataManagerUtility getConnectedUtilityInstance() { return MeasurementDataManagerUtility.getInstance(rhqDs); } + + private void pushToAlertSubsystem(Set<MeasurementData> data) { + MeasurementReport fakeReport = new MeasurementReport(); + for(MeasurementData datum : data) { + if (datum instanceof MeasurementDataTrait) { + fakeReport.addData((MeasurementDataTrait) datum); + } else if (datum instanceof MeasurementDataNumeric) { + fakeReport.addData((MeasurementDataNumeric) datum); + } + } + + this.measurementDataManager.mergeMeasurementReport(fakeReport); + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 0aa09a4..b92548f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -128,6 +128,7 @@ import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.core.AgentManagerLocal; import org.rhq.enterprise.server.discovery.DiscoveryServerServiceImpl; +import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; import org.rhq.enterprise.server.resource.disambiguation.DisambiguationUpdateStrategy; import org.rhq.enterprise.server.resource.disambiguation.Disambiguator; @@ -172,6 +173,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage @EJB //@IgnoreDependency private MeasurementScheduleManagerLocal measurementScheduleManager; + @EJB + private AvailabilityManagerLocal availabilityManager; public void createResource(Subject user, Resource resource, int parentId) throws ResourceAlreadyExistsException { Resource parent = null; @@ -2436,18 +2439,19 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage return getResourceById(subject, resourceId); } + @Override + @TransactionAttribute(TransactionAttributeType.NEVER) public ResourceAvailability getLiveResourceAvailability(Subject subject, int resourceId) { Resource res = getResourceById(subject, resourceId); ResourceAvailability results = new ResourceAvailability(res, AvailabilityType.UNKNOWN); try { - Agent agent = res.getAgent(); - if (agent == null) { + // first, quickly see if we can even ping the agent, if not, don't bother trying to get the resource avail + AgentClient client = agentManager.getAgentClient(subject, res.getId()); + if (client == null) { throw new IllegalStateException("No agent is associated with the resource with id [" + resourceId + "]"); } - // first, quickly see if we can even ping the agent, if not, don't bother trying to get the resource avail - AgentClient client = agentManager.getAgentClient(agent); boolean agentPing = client.ping(5000L); if (agentPing) { // we can't serialize the resource due to the hibernate proxies (agent can't deserialize hibernate objs) @@ -2458,10 +2462,17 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage Availability avail = client.getDiscoveryAgentService().getCurrentAvailability(bareResource); if (avail != null) { results.setAvailabilityType(avail.getAvailabilityType()); + + AvailabilityReport report = new AvailabilityReport(true, client.getAgent().getName()); + avail.setStartTime(System.currentTimeMillis()); + report.addAvailability(avail); + availabilityManager.mergeAvailabilityReport(report); } - entityManager.flush(); } - } catch (Throwable ignore) { + } catch (Exception e) { + if (log.isInfoEnabled()) { + log.info("Failed to get live availability.", e); + } } return results;

1 0

[rhq] 2 commits - modules/core modules/enterprise
by Heiko W. Rupp 15 Aug '13

15 Aug '13

modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 135 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 4 2 files changed, 73 insertions(+), 66 deletions(-) New commits: commit f1cc58b4e1f132a38c2c0a9855fc5778cc87812e Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Aug 15 10:41:28 2013 +0200 Get dbupgrade to work again. diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 9bfdb46..ddc5de9 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -1291,7 +1291,7 @@ ALTER TABLE RHQ_OPERATION_SCHEDULE ADD PRIMARY KEY (ID) </statement> </schema-directSQL> - <schema-directSQL ignoreError="true"> + <schema-directSQL ignoreError="true"> <statement desc="Changing primary key of RHQ_OPERATION_SCHEDULE to ID. Step3/3..."> CREATE UNIQUE INDEX RHQ_OPERATION_SCHEDULE_KEY_IDX ON RHQ_OPERATION_SCHEDULE (JOB_NAME, JOB_GROUP) </statement> @@ -1373,7 +1373,7 @@ <schema-directSQL> <statement> INSERT INTO RHQ_PERMISSION (role_id, operation) - SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1 AND NOT role_id = 2 + SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1 AND NOT role_id = 2 </statement> </schema-directSQL> </schemaSpec> @@ -1469,11 +1469,11 @@ <schema-addColumn table="RHQ_DRIFT_CONFIG" column="NAME" columnType="VARCHAR2" precision="512" /> <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="NAME" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT_CONFIG" column="INTERVAL" columnType="LONG" /> - <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="INTERVAL" nullable="FALSE" /> + <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="INTERVAL" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT_CONFIG" column="IS_ENABLED" columnType="BOOLEAN" /> <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="IS_ENABLED" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT_CONFIG" column="CONFIG_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="CONFIG_ID" nullable="FALSE" /> + <schema-alterColumn table="RHQ_DRIFT_CONFIG" column="CONFIG_ID" nullable="FALSE" /> <schema-directSQL> <statement desc="Creating RHQ_DRIFT_CONFIG foreign key relation to RHQ_CONFIG"> ALTER TABLE RHQ_DRIFT_CONFIG @@ -1482,7 +1482,7 @@ REFERENCES RHQ_CONFIG (ID) </statement> </schema-directSQL> - <schema-addColumn table="RHQ_DRIFT_CONFIG" column="RESOURCE_ID" columnType="INTEGER" /> + <schema-addColumn table="RHQ_DRIFT_CONFIG" column="RESOURCE_ID" columnType="INTEGER" /> <schema-directSQL> <statement desc="Creating RHQ_DRIFT_CONFIG foreign key relation to RHQ_RESOURCE"> ALTER TABLE RHQ_DRIFT_CONFIG @@ -1492,7 +1492,7 @@ </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_DRIFT_CHANGE_SET_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -1507,7 +1507,7 @@ <schema-addColumn table="RHQ_DRIFT_CHANGE_SET" column="CATEGORY" columnType="VARCHAR2" precision="20" /> <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="CATEGORY" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT_CHANGE_SET" column="RESOURCE_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="RESOURCE_ID" nullable="FALSE" /> + <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="RESOURCE_ID" nullable="FALSE" /> <schema-directSQL> <statement desc="Creating RHQ_DRIFT_CHANGE_SET foreign key relation to RHQ_RESOURCE"> ALTER TABLE RHQ_DRIFT_CHANGE_SET @@ -1515,9 +1515,9 @@ FOREIGN KEY (RESOURCE_ID) REFERENCES RHQ_RESOURCE (ID) </statement> - </schema-directSQL> + </schema-directSQL> <schema-addColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_CONFIG_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_CONFIG_ID" nullable="FALSE" /> + <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_CONFIG_ID" nullable="FALSE" /> <schema-directSQL> <statement desc="Creating RHQ_DRIFT_CHANGE_SET foreign key relation to RHQ_DRIFT_CONFIG"> ALTER TABLE RHQ_DRIFT_CHANGE_SET @@ -1631,10 +1631,10 @@  - <schemaSpec version="2.115"> + <schemaSpec version="2.115">  <schema-createSequence name="RHQ_DRIFT_DEF_TEMPLATE_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -1654,7 +1654,7 @@ <schema-addColumn table="RHQ_DRIFT_DEF_TEMPLATE" column="CTIME" columnType="LONG" /> <schema-alterColumn table="RHQ_DRIFT_DEF_TEMPLATE" column="CTIME" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT_DEF_TEMPLATE" column="IS_USER_DEFINED" columnType="BOOLEAN" /> - <schema-alterColumn table="RHQ_DRIFT_DEF_TEMPLATE" column="IS_USER_DEFINED" nullable="FALSE" /> + <schema-alterColumn table="RHQ_DRIFT_DEF_TEMPLATE" column="IS_USER_DEFINED" nullable="FALSE" /> <schema-directSQL> <statement desc="Creating RHQ_DRIFT_DEF_TEMPLATE foreign key to RHQ_RESOURCE_TYPE"> ALTER TABLE RHQ_DRIFT_DEF_TEMPLATE @@ -1676,7 +1676,7 @@ </schema-directSQL>  - <schema-directSQL> + <schema-directSQL> <statement> ALTER TABLE RHQ_DRIFT_CONFIG RENAME TO RHQ_DRIFT_DEFINITION </statement> @@ -1685,17 +1685,17 @@ </statement> <statement targetDBVendor="oracle"> RENAME RHQ_DRIFT_CONFIG_ID_SEQ TO RHQ_DRIFT_DEFINITION_ID_SEQ - </statement> + </statement> </schema-directSQL>  - <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DESCRIPTION" columnType="VARCHAR2" precision="512" /> + <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DESCRIPTION" columnType="VARCHAR2" precision="512" /> <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_HANDLING_MODE" columnType="VARCHAR2" precision="20" /> <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="IS_PINNED" columnType="BOOLEAN"/> <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" columnType="BOOLEAN"/> <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_DEF_TEMPLATE_ID" columnType="INTEGER"/> - -  + +  <schema-directSQL> <statement targetDBVendor="postgresql" desc="RHQ_DRIFT_DEFINITION: set is_pinned column (false)"> UPDATE RHQ_DRIFT_DEFINITION SET IS_PINNED = FALSE @@ -1712,9 +1712,9 @@ <statement desc="RHQ_DRIFT_DEFINITION: set drift_handling_mode column (normal)"> UPDATE RHQ_DRIFT_DEFINITION SET DRIFT_HANDLING_MODE = 'normal' </statement> - </schema-directSQL> + </schema-directSQL> <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_PINNED" nullable="FALSE"/> - <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" nullable="FALSE"/> + <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="IS_ATTACHED" nullable="FALSE"/> <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="DRIFT_HANDLING_MODE" nullable="FALSE" />  @@ -1740,7 +1740,7 @@   <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="RESOURCE_ID" nullable="TRUE" /> - +  <schema-addColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_SET_ID" columnType="INTEGER"/> <schema-directSQL> @@ -1750,9 +1750,9 @@ FOREIGN KEY (DRIFT_SET_ID) REFERENCES RHQ_DRIFT_SET (ID) </statement> - </schema-directSQL> + </schema-directSQL> + -  <schema-directSQL> <statement desc="Renaming RHQ_DRIFT_CHANGE_SET.DRIFT_CONFIG_ID column to DRIFT_DEFINITION_ID"> @@ -1768,20 +1768,20 @@ <statement desc="RHQ_DRIFT_CHANGE_SET: set drift_handling_mode column (normal)"> UPDATE RHQ_DRIFT_CHANGE_SET SET DRIFT_HANDLING_MODE = 'normal' </statement> - </schema-directSQL> + </schema-directSQL> <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_HANDLING_MODE" nullable="FALSE" />  -  +  <schema-addColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" columnType="VARCHAR2" precision="1024" /> - +  - <schema-javaTask className="DriftPathDirectoryDatabaseUpgradeTask" /> + <schema-javaTask className="DriftPathDirectoryDatabaseUpgradeTask" />  - <schema-alterColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" nullable="FALSE" /> - + <schema-alterColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" nullable="FALSE" /> +  <schema-addColumn table="RHQ_DRIFT" column="DRIFT_SET_ID" columnType="INTEGER"/> <schema-directSQL> @@ -1795,48 +1795,48 @@  - <schema-javaTask className="DriftTemplateMapDatabaseUpgradeTask" /> + <schema-javaTask className="DriftTemplateMapDatabaseUpgradeTask" /> </schemaSpec>  <schemaSpec version="2.116"> -  +  <schema-addColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" columnType="INTEGER"/> <schema-directSQL> <statement desc="RHQ_DRIFT_DEFINITION: set compliance_status column (in compliance)"> UPDATE RHQ_DRIFT_DEFINITION SET COMPLIANCE_STATUS = 0 </statement> </schema-directSQL> - <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" nullable="FALSE"/> - + <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="COMPLIANCE_STATUS" nullable="FALSE"/> + <schema-alterColumn table="RHQ_DRIFT_DEFINITION" column="NAME" columnType="VARCHAR2" precision="512" /> - - -  + + +   <schema-alterColumn table="RHQ_PRD_VER" column="VERSION" columnType="VARCHAR2" precision="100" /> </schemaSpec>  - + <schemaSpec version="2.117">  <schema-dropTable table="RHQ_DRIFT_TEMPLATE_MAP" ignoreError="true" /> - +  - <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_DEFINITION_ID" nullable="TRUE" /> + <schema-alterColumn table="RHQ_DRIFT_CHANGE_SET" column="DRIFT_DEFINITION_ID" nullable="TRUE" /> </schemaSpec> <schemaSpec version="2.118">  <schema-directSQL> <statement> - DELETE FROM RHQ_PERMISSION WHERE role_id = 2 AND operation = 15 + DELETE FROM RHQ_PERMISSION WHERE role_id = 2 AND operation = 15 </statement> </schema-directSQL> </schemaSpec> @@ -1849,42 +1849,42 @@ </statement> </schema-directSQL> </schemaSpec> - + <schemaSpec version="2.120"> -  +  <schema-addColumn table="RHQ_AGENT" column="LAST_AVAILABILITY_PING" columnType="LONG"/> <schema-directSQL> <statement desc="RHQ_AGENT: init last_availability_ping to last_availability_report"> - UPDATE RHQ_AGENT SET LAST_AVAILABILITY_PING = LAST_AVAILABILITY_REPORT + UPDATE RHQ_AGENT SET LAST_AVAILABILITY_PING = LAST_AVAILABILITY_REPORT </statement> </schema-directSQL>  <schema-directSQL> <statement desc="Changing AGENT_MAX_QUIET_TIME_ALLOWED to 5 minutes from 15 minutes"> - UPDATE RHQ_SYSTEM_CONFIG - SET PROPERTY_VALUE = '300000', DEFAULT_PROPERTY_VALUE = '300000' + UPDATE RHQ_SYSTEM_CONFIG + SET PROPERTY_VALUE = '300000', DEFAULT_PROPERTY_VALUE = '300000' WHERE PROPERTY_KEY = 'AGENT_MAX_QUIET_TIME_ALLOWED' </statement> </schema-directSQL> - +  <schema-directSQL> <statement desc="Changing NULL RHQ_AVAILABILITY.AVAILABILITY_TYPE to UNKNOWN"> UPDATE RHQ_AVAILABILITY - SET AVAILABILITY_TYPE = 2 + SET AVAILABILITY_TYPE = 2 WHERE AVAILABILITY_TYPE IS NULL </statement> <statement desc="Changing NULL RHQ_RESOURCE_AVAIL.AVAILABILITY_TYPE to UNKNOWN"> UPDATE RHQ_RESOURCE_AVAIL - SET AVAILABILITY_TYPE = 2 + SET AVAILABILITY_TYPE = 2 WHERE AVAILABILITY_TYPE IS NULL </statement> </schema-directSQL> <schema-alterColumn table="RHQ_AVAILABILITY" column="AVAILABILITY_TYPE" nullable="FALSE"/> - <schema-alterColumn table="RHQ_RESOURCE_AVAIL" column="AVAILABILITY_TYPE" nullable="FALSE"/> - + <schema-alterColumn table="RHQ_RESOURCE_AVAIL" column="AVAILABILITY_TYPE" nullable="FALSE"/> + </schemaSpec> <schemaSpec version="2.121"> @@ -1892,27 +1892,27 @@ </schemaSpec>  - + <schemaSpec version="2.122"> - <schema-directSQL> + <schema-directSQL> <statement desc="Updating DOWN Alert Conditions to new format"> UPDATE RHQ_ALERT_CONDITION SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL - WHERE TYPE = 'AVAILABILITY' + WHERE TYPE = 'AVAILABILITY' AND NAME IS NULL AND OPTION_STATUS = 'DOWN' </statement> <statement desc="Updating UP Alert Conditions to new format"> UPDATE RHQ_ALERT_CONDITION - SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL + SET NAME = 'AVAIL_GOES_UP', OPTION_STATUS = NULL WHERE TYPE = 'AVAILABILITY' AND NAME IS NULL AND OPTION_STATUS = 'UP' - </statement> - </schema-directSQL> + </statement> + </schema-directSQL> </schemaSpec> - - + + <schemaSpec version="2.123"> @@ -1989,8 +1989,8 @@ </schema-directSQL> </schemaSpec> - - + +  <schemaSpec version="2.129"> <schema-directSQL> @@ -2080,12 +2080,12 @@ <schemaSpec version="2.135">  - +  <schema-directSQL> <statement desc="Inserting MANAGE_BUNDLE_GROUPS permission for all MANAGE_BUNDLE (12) roles"> INSERT INTO rhq_permission (role_id, operation) SELECT role_id, 18 FROM rhq_permission p where p.operation = 12 - </statement> + </statement> <statement desc="Inserting CREATE_BUNDLES permission for all MANAGE_BUNDLE (12) roles"> INSERT INTO rhq_permission (role_id, operation) SELECT role_id, 19 FROM rhq_permission p where p.operation = 12 </statement> @@ -2181,6 +2181,13 @@ <schemaSpec version="2.136"> <schema-addColumn table="RHQ_CONFIG_PD_OSRC" column="EXPRESSION_SCOPE" columnType="VARCHAR2" precision="12"/> + <schema-directSQL> + <statement desc="Fill in defaults"> + UPDATE RHQ_CONFIG_PD_OSRC + SET EXPRESSION_SCOPE = 'unlimited' + WHERE EXPRESSION_SCOPE IS NULL + </statement> + </schema-directSQL> <schema-alterColumn table="RHQ_CONFIG_PD_OSRC" column="EXPRESSION_SCOPE" nullable="false" default="unlimited"/> </schemaSpec> @@ -2196,10 +2203,10 @@ REFERENCES RHQ_OPERATION_HISTORY (ID) </statement> <statement targetDBVendor="postgresql" desc="Set maintenance_pending flag to false for existing storage nodes"> - UPDATE RHQ_STORAGE_NODE SET IGNORED = false + UPDATE RHQ_STORAGE_NODE SET MAINTENANCE_PENDING = false </statement> <statement targetDBVendor="oracle" desc="Set maintenance_pending flag to false for existing storage nodes"> - UPDATE RHQ_STORAGE_NODE SET IGNORED = 0 + UPDATE RHQ_STORAGE_NODE SET MAINTENANCE_PENDING = 0 </statement> </schema-directSQL> </schemaSpec> commit 67cc69eefd11f2d64d54df979d1b2f1585665f9b Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Aug 13 15:57:01 2013 +0200 BZ 996276 Fix example expressions diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java index 9678629..3a216a2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java @@ -306,8 +306,8 @@ public class JobTriggerEditor extends EnhancedVLayout { + " </tbody>\n" + "\n" + "</table>\n" - + "<p>So cron expressions can be as simple as this: <tt>* * * * ? *</tt><br />\n" - + "or more complex, like this: <tt>0/5 14,18,3-39,52 * ? JAN,MAR,SEP MON-FRI 2002-2010</tt></p>\n" + + "<p>So cron expressions can be as simple as this: <tt>0 * * ? * *</tt> to run every minute on the minute<br />\n" + + "or more complex, like this: <tt>0/5 14,18,3-39,52 * ? JAN,MAR,SEP MON-FRI 2002-2015</tt></p>\n" + "\n" + "<h2><a name=\"CronTriggersTutorial-Specialcharacters\"></a>Special Characters</h2>\n" + "\n"

1 0

[rhq] 2 commits - modules/core modules/enterprise modules/plugins
by John Sanda 15 Aug '13

15 Aug '13

modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 1 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 7 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 11 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageConfigurationException.java | 23 --- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 72 +++------- modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 1 modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 2 7 files changed, 45 insertions(+), 72 deletions(-) New commits: commit 94bb4f2ea3f458837a3bf55013685e84ec32b321 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Aug 15 01:57:08 2013 -0400 removing unused exception class diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageConfigurationException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageConfigurationException.java deleted file mode 100644 index dc616a8..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageConfigurationException.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.rhq.enterprise.server.storage; - -/** - * @author John Sanda - */ -public class StorageConfigurationException extends RuntimeException { - - public StorageConfigurationException() { - super(); - } - - public StorageConfigurationException(String message) { - super(message); - } - - public StorageConfigurationException(String message, Throwable cause) { - super(message, cause); - } - - public StorageConfigurationException(Throwable cause) { - super(cause); - } -} commit 578ad8d0103ee9f2a834a32ee082ce39268a6ddc Author: John Sanda <jsanda(a)redhat.com> Date: Thu Aug 15 01:56:04 2013 -0400 add maintenance flag for queueing up storage nodes to be processed diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml index f307ff8..da9ff04 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml @@ -455,6 +455,7 @@ <column name="CTIME" required="true" type="LONG" /> <column name="MTIME" required="true" type="LONG" /> <column name="ERROR_MSG" required="false" type="LONGVARCHAR"/> + <column name="MAINTENANCE_PENDING" required="true" type="BOOLEAN" default="false"/> <column name="RESOURCE_ID" required="false" type="INTEGER" references="RHQ_RESOURCE(ID)" /> <column name="RESOURCE_OP_HIST_ID" required="false" type="INTEGER" references="RHQ_OPERATION_HISTORY(ID)"/> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index edf0147..9bfdb46 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2185,6 +2185,7 @@ </schemaSpec> <schemaSpec version="2.137"> + <schema-addColumn table="RHQ_STORAGE_NODE" column="MAINTENANCE_PENDING" columnType="BOOLEAN"/> <schema-addColumn table="RHQ_STORAGE_NODE" column="ERROR_MSG" columnType="LONGVARCHAR"/> <schema-addColumn table="RHQ_STORAGE_NODE" column="RESOURCE_OP_HIST_ID" columnType="INTEGER"/> <schema-directSQL> @@ -2194,6 +2195,12 @@ FOREIGN KEY (RESOURCE_OP_HIST_ID) REFERENCES RHQ_OPERATION_HISTORY (ID) </statement> + <statement targetDBVendor="postgresql" desc="Set maintenance_pending flag to false for existing storage nodes"> + UPDATE RHQ_STORAGE_NODE SET IGNORED = false + </statement> + <statement targetDBVendor="oracle" desc="Set maintenance_pending flag to false for existing storage nodes"> + UPDATE RHQ_STORAGE_NODE SET IGNORED = 0 + </statement> </schema-directSQL> </schemaSpec> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 3f2a89c..54a0db5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -135,6 +135,9 @@ public class StorageNode implements Serializable { @Column(name = "MTIME", nullable = false) private long mtime; + @Column(name = "MAINTENANCE_PENDING", nullable = false) + private boolean maintenancePending; + @Column(name = "ERROR_MSG", nullable = true) private String errorMessage; @@ -198,6 +201,14 @@ public class StorageNode implements Serializable { this.mtime = mtime; } + public boolean isMaintenancePending() { + return maintenancePending; + } + + public void setMaintenancePending(boolean maintenancePending) { + this.maintenancePending = maintenancePending; + } + public Resource getResource() { return resource; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index 72f5e9d..2a79c59 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -84,18 +84,19 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa List<StorageNode> allNodes = new ArrayList<StorageNode>(clusterNodes); allNodes.add(storageNode); - announceStorageNode(subject, storageNode, createPropertyListOfAddresses("addresses", allNodes), - getAddresses(clusterNodes)); + for (StorageNode clusterNode : clusterNodes) { + clusterNode.setMaintenancePending(true); + } - } + announceStorageNode(subject, storageNode, clusterNodes.get(0), createPropertyListOfAddresses("addresses", + allNodes)); - private void announceStorageNode(Subject subject, StorageNode storageNode, PropertyList addresses, - List<String> remainingNodes) { - String address = remainingNodes.remove(0); - StorageNode clusterNode = findStorageNodeByAddress(address); + } + private void announceStorageNode(Subject subject, StorageNode newStorageNode, StorageNode clusterNode, + PropertyList addresses) { if (log.isInfoEnabled()) { - log.info("Announcing " + storageNode + " to cluster node " + clusterNode); + log.info("Announcing " + newStorageNode + " to cluster node " + clusterNode); } ResourceOperationSchedule schedule = new ResourceOperationSchedule(); schedule.setResource(clusterNode.getResource()); @@ -104,7 +105,6 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa schedule.setOperationName("updateKnownNodes"); Configuration parameters = new Configuration(); parameters.put(addresses); - parameters.put(new PropertySimple("remainingNodes", StringUtil.listToString(remainingNodes))); schedule.setParameters(parameters); operationManager.scheduleResourceOperation(subject, schedule); @@ -141,8 +141,9 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL) .getResultList(); for (StorageNode node : clusterNodes) { - node.setOperationMode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + node.setMaintenancePending(true); } + storageNode.setMaintenancePending(true); clusterNodes.add(storageNode); boolean runRepair = updateSchemaIfNecessary(clusterNodes); performAddNodeMaintenance(subject, storageNode, runRepair, createPropertyListOfAddresses(SEEDS_LIST, @@ -231,19 +232,20 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa operationFailed(storageNode, resourceOperationHistory, newStorageNode); return; default: // SUCCESS + storageNode.setMaintenancePending(false); Configuration parameters = resourceOperationHistory.getParameters(); PropertyList addresses = parameters.getList("addresses"); - List<String> remainingNodes = getRemainingNodes(resourceOperationHistory); + StorageNode nextNode = takeFromMaintenanceQueue(); newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); Subject subject = getSubject(resourceOperationHistory); - if (remainingNodes.isEmpty()) { + if (nextNode == null) { log.info("Successfully announced new storage node to storage cluster"); newStorageNode.setOperationMode(StorageNode.OperationMode.BOOTSTRAP); prepareNodeForBootstrap(subject, newStorageNode, addresses.deepCopy(false)); } else { - announceStorageNode(subject, newStorageNode, addresses.deepCopy(false), remainingNodes); + announceStorageNode(subject, newStorageNode, nextNode, addresses.deepCopy(false)); } } } @@ -293,11 +295,14 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa if (log.isInfoEnabled()) { log.info("Finished cluster maintenance for " + storageNode + " for addition of new node"); } - storageNode.setOperationMode(StorageNode.OperationMode.NORMAL); - StorageNode nextNode = takeFromQueue(storageNode, StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + storageNode.setMaintenancePending(false); + StorageNode nextNode = takeFromMaintenanceQueue(); if (nextNode == null) { log.info("Finished running cluster maintenance for addition of new node"); + // TODO replace this with an UPDATE statement + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + newStorageNode.setOperationMode(StorageNode.OperationMode.NORMAL); } else { Configuration parameters = resourceOperationHistory.getParameters(); boolean runRepair = parameters.getSimple(RUN_REPAIR_PROPERTY).getBooleanValue(); @@ -399,33 +404,16 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa operationManager.scheduleResourceOperation(subject, schedule); } - private StorageNode takeFromQueue(StorageNode lastTaken, StorageNode.OperationMode queue) { - List<StorageNode> nodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE_EXCLUDING, - StorageNode.class).setParameter("operationMode", queue).setParameter("storageNode", lastTaken) + private StorageNode takeFromMaintenanceQueue() { + List<StorageNode> storageNodes = entityManager.createQuery("SELECT s FROM StorageNode s WHERE " + + "s.operationMode = :operationMode AND s.maintenancePending = :maintenancePending", StorageNode.class) + .setParameter("operationMode", StorageNode.OperationMode.NORMAL).setParameter("maintenancePending", true) .getResultList(); - if (nodes.isEmpty()) { + if (storageNodes.isEmpty()) { return null; } - return nodes.get(0); - } - - private List<String> getRemainingNodes(ResourceOperationHistory resourceOperationHistory) { - LinkedList<String> addresses = new LinkedList<String>(); - Configuration results = resourceOperationHistory.getResults(); - String remainingNodes = results.getSimpleValue("remainingNodes"); - - if (!StringUtil.isEmpty(remainingNodes)) { - for (String address : remainingNodes.split(",")) { - addresses.add(address); - } - } - return addresses; - } - - private StorageNode findStorageNodeByAddress(String address) { - return entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class) - .setParameter("address", address).getSingleResult(); + return storageNodes.get(0); } private StorageNode findNewStorgeNode(StorageNode.OperationMode operationMode) { @@ -537,12 +525,4 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return list; } - private List<String> getAddresses(List<StorageNode> storageNodes) { - List<String> addresses = new LinkedList<String>(); - for (StorageNode storageNode : storageNodes) { - addresses.add(storageNode.getAddress()); - } - return addresses; - } - } diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index 7f58037..a24a219 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -257,7 +257,6 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper Configuration complexResults = result.getComplexResults(); complexResults.put(new PropertySimple("details", "Successfully updated the set of known nodes.")); - complexResults.put(params.get("remainingNodes").deepCopy(false)); return result; } catch (InternodeAuthConfUpdateException e) { diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index 4ef10cd..cc01c9d 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -102,11 +102,9 @@ <c:list-property name="addresses"> <c:simple-property name="address"/> </c:list-property> - <c:simple-property name="remainingNodes"/> </parameters> <results> <c:simple-property name="details"/> - <c:simple-property name="remainingNodes"/> </results> </operation>

1 0

[rhq] 5 commits - modules/core modules/enterprise modules/plugins
by John Sanda 15 Aug '13

15 Aug '13

modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 4 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 13 modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java | 32 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 79 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java | 356 ++++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java | 19 modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java | 4 modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml | 5 12 files changed, 369 insertions(+), 160 deletions(-) New commits: commit 6a41f788ada57056207fa5ee36259c9f1f2fb42a Author: John Sanda <jsanda(a)redhat.com> Date: Wed Aug 14 23:32:41 2013 -0400 bump up dbupgrade version diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 2e8e4b8..1c66dd6 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -17,7 +17,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.136</db.schema.version> + <db.schema.version>2.137</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> commit 9a9767577237ee0efc6cd902a3fb8861f280d193 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Aug 14 23:02:34 2013 -0400 adding more error handling for storage node deployments In my previous commit I added code to persist resource operation failures that occur during storage node deployment. This commit adds error handling for unexpected server side errors. Errors are logged to the StorageNode entity in a separate transaction to ensure that the error message gets persisted. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java deleted file mode 100644 index fca6e96..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.rhq.enterprise.server.storage; - -/** - * @author John Sanda - */ -public class StorageNodeDeploymentException extends RuntimeException { - - public StorageNodeDeploymentException() { - } - - public StorageNodeDeploymentException(String message) { - super(message); - } - - public StorageNodeDeploymentException(String message, Throwable cause) { - super(message, cause); - } - - public StorageNodeDeploymentException(Throwable cause) { - super(cause); - } -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index aaa54f5..72f5e9d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -12,7 +12,6 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,13 +22,13 @@ import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.operation.OperationHistory; import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.util.StringUtil; +import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SessionManager; import org.rhq.enterprise.server.auth.SubjectManagerLocal; @@ -71,8 +70,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa @EJB private StorageClientManagerBean storageClientManager; + @EJB + private StorageNodeOperationsHandlerLocal storageNodeOperationsHandler; + @Override - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void announceStorageNode(Subject subject, StorageNode storageNode) { if (log.isInfoEnabled()) { log.info("Announcing " + storageNode + " to storage node cluster."); @@ -110,6 +111,18 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void logError(StorageNode.OperationMode newStorageNodeOperationMode, String error, Exception e) { + try { + StorageNode newStorageNode = findNewStorgeNode(newStorageNodeOperationMode); + newStorageNode.setErrorMessage(error + " Check the server log for details. Root cause: " + + ThrowableUtil.getRootCause(e).getMessage()); + } catch (Exception e1) { + log.error("Failed to log error against storage node", e); + } + } + + @Override public void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) { StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult(); @@ -167,24 +180,77 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return; } - ResourceOperationHistory resourceOperationHistory = entityManager.find(ResourceOperationHistory.class, - operationHistory.getId()); - if (resourceOperationHistory == null) { + ResourceOperationHistory resourceOperationHistory = (ResourceOperationHistory) operationHistory; + if (!isStorageNodeOperation(resourceOperationHistory)) { return; } - if (isStorageNodeOperation(resourceOperationHistory.getOperationDefinition())) { - if (resourceOperationHistory.getOperationDefinition().getName().equals("updateKnownNodes")) { - handleUpdateKnownNodes(resourceOperationHistory); - } else if (operationHistory.getOperationDefinition().getName().equals("prepareForBootstrap")) { - handlePrepareForBootstrap(resourceOperationHistory); - } else if (operationHistory.getOperationDefinition().getName().equals("addNodeMaintenance")) { - handleAddNodeMaintenance(resourceOperationHistory); + if (resourceOperationHistory.getOperationDefinition().getName().equals("updateKnownNodes")) { + try { + storageNodeOperationsHandler.handleUpdateKnownNodes(resourceOperationHistory); + } catch (Exception e) { + String msg = "Aborting storage node deployment due to unexpected error while announcing cluster nodes."; + log.error(msg, e); + storageNodeOperationsHandler.logError(StorageNode.OperationMode.ANNOUNCE, msg, e); + } + } else if (operationHistory.getOperationDefinition().getName().equals("prepareForBootstrap")) { + try { + storageNodeOperationsHandler.handlePrepareForBootstrap(resourceOperationHistory); + } catch (Exception e) { + String msg = "Aborting storage node deployment due to unexpected error while bootstrapping new node."; + log.error(msg, e); + storageNodeOperationsHandler.logError(StorageNode.OperationMode.BOOTSTRAP, msg, e); + } + } else if (operationHistory.getOperationDefinition().getName().equals("addNodeMaintenance")) { + try { + storageNodeOperationsHandler.handleAddNodeMaintenance(resourceOperationHistory); + } catch (Exception e) { + String msg = "Aborting storage node deployment due to unexpected error while performing add node " + + "maintenance."; + log.error(msg, e); + storageNodeOperationsHandler.logError(StorageNode.OperationMode.ADD_NODE_MAINTENANCE, msg, e); } } + } - private void handlePrepareForBootstrap(ResourceOperationHistory resourceOperationHistory) { + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void handleUpdateKnownNodes(ResourceOperationHistory resourceOperationHistory) { + StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); + StorageNode newStorageNode = null; + switch (resourceOperationHistory.getStatus()) { + case INPROGRESS: + // nothing to do here + return; + case CANCELED: + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + operationCanceled(storageNode, resourceOperationHistory, newStorageNode); + case FAILURE: + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + operationFailed(storageNode, resourceOperationHistory, newStorageNode); + return; + default: // SUCCESS + Configuration parameters = resourceOperationHistory.getParameters(); + PropertyList addresses = parameters.getList("addresses"); + List<String> remainingNodes = getRemainingNodes(resourceOperationHistory); + + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + Subject subject = getSubject(resourceOperationHistory); + + if (remainingNodes.isEmpty()) { + log.info("Successfully announced new storage node to storage cluster"); + newStorageNode.setOperationMode(StorageNode.OperationMode.BOOTSTRAP); + prepareNodeForBootstrap(subject, newStorageNode, addresses.deepCopy(false)); + } else { + announceStorageNode(subject, newStorageNode, addresses.deepCopy(false), remainingNodes); + } + } + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void handlePrepareForBootstrap(ResourceOperationHistory resourceOperationHistory) { StorageNode newStorageNode = findStorageNode(resourceOperationHistory.getResource()); switch (resourceOperationHistory.getStatus()) { case INPROGRESS: @@ -195,15 +261,9 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa // If the operation is canceled the plugin will get an InterruptedException. // The actual bootstrapping may very well complete so we need to add in some // checks to find out if the node is up and part of the cluster. - - log.error("The operation [prepareForBootstrap] was canceled for " + newStorageNode + - ". Deployment of the new storage node cannot proceed."); operationCanceled(newStorageNode, resourceOperationHistory); return; case FAILURE: - log.error("The operation [preparedForBootstrap] failed for " + newStorageNode + ". The reported " + - "failure is: " + resourceOperationHistory.getErrorMessage()); - log.error("Deployment of the new storage node cannot proceed."); operationFailed(newStorageNode, resourceOperationHistory); return; default: // SUCCESS @@ -212,47 +272,9 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } } - private void handleUpdateKnownNodes(ResourceOperationHistory resourceOperationHistory) { - StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); - StorageNode newStorageNode = null; - switch (resourceOperationHistory.getStatus()) { - case INPROGRESS: - // nothing to do here - return; - case CANCELED: - log.error("The operation [updateKnownNodes] was canceled for " + storageNode + - ". Deployment of the new storage node cannot proceed."); - newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); - operationCanceled(storageNode, resourceOperationHistory, newStorageNode); - case FAILURE: - log.error("The operation [updateKnownNodes] failed for " + storageNode + ". The reported " + - "failure is: " + resourceOperationHistory.getErrorMessage()); - log.error("Deployment of the new storage node cannot proceed."); - newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); - operationFailed(storageNode, resourceOperationHistory, newStorageNode); - return; - default: // SUCCESS - if (log.isInfoEnabled()) { - log.info("Finished announcing cluster nodes to " + storageNode); - } - Configuration parameters = resourceOperationHistory.getParameters(); - PropertyList addresses = parameters.getList("addresses"); - List<String> remainingNodes = getRemainingNodes(resourceOperationHistory); - - newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); - Subject subject = getSubject(resourceOperationHistory); - - if (remainingNodes.isEmpty()) { - log.info("Successfully announced new storage node to cluster"); - newStorageNode.setOperationMode(StorageNode.OperationMode.BOOTSTRAP); - prepareNodeForBootstrap(subject, newStorageNode, addresses.deepCopy(false)); - } else { - announceStorageNode(subject, newStorageNode, addresses.deepCopy(false), remainingNodes); - } - } - } - - private void handleAddNodeMaintenance(ResourceOperationHistory resourceOperationHistory) { + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void handleAddNodeMaintenance(ResourceOperationHistory resourceOperationHistory) { StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); StorageNode newStorageNode = null; switch (resourceOperationHistory.getStatus()) { @@ -260,21 +282,16 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa // nothing to do here return; case CANCELED: - log.error("The operation [addNodeMaintenance] was canceled for " + storageNode + ". This operation " + - "needs to be run on each storage node when a new node is added to the cluster."); newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); operationCanceled(storageNode, resourceOperationHistory, newStorageNode); return; case FAILURE: - log.error("The operation [addNodeMaintenance] failed for " + storageNode + ". This operation " + - "needs to be run on each storage node when a new node is added to the cluster. The reported " + - "failure is: " + resourceOperationHistory.getErrorMessage()); newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); operationFailed(storageNode, resourceOperationHistory, newStorageNode); return; default: // SUCCESS if (log.isInfoEnabled()) { - log.info("Finnished cluster maintenance for " + storageNode + " for addition of new node"); + log.info("Finished cluster maintenance for " + storageNode + " for addition of new node"); } storageNode.setOperationMode(StorageNode.OperationMode.NORMAL); StorageNode nextNode = takeFromQueue(storageNode, StorageNode.OperationMode.ADD_NODE_MAINTENANCE); @@ -298,6 +315,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa private void operationCanceled(StorageNode storageNode, ResourceOperationHistory operationHistory, StorageNode newStorageNode) { + log.error("Deployment has been aborted due to canceled operation [" + + operationHistory.getOperationDefinition().getDisplayName() + " on " + storageNode.getResource() + + ": " + operationHistory.getErrorMessage()); + newStorageNode.setErrorMessage("Deployment has been aborted due to canceled resource operation on " + storageNode.getAddress()); storageNode.setErrorMessage("Deployment of " + newStorageNode.getAddress() + " has been aborted due " + @@ -307,6 +328,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } private void operationCanceled(StorageNode newStorageNode, ResourceOperationHistory operationHistory) { + log.error("Deployment has been aborted due to canceled operation [" + + operationHistory.getOperationDefinition().getDisplayName() + " on " + newStorageNode.getResource() + + ": " + operationHistory.getErrorMessage()); + newStorageNode.setErrorMessage("Deployment has been aborted due to canceled resource operation [" + operationHistory.getOperationDefinition().getDisplayName() + "]."); newStorageNode.setFailedOperation(operationHistory); @@ -314,6 +339,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa private void operationFailed(StorageNode storageNode, ResourceOperationHistory operationHistory, StorageNode newStorageNode) { + log.error("Deployment has been aborted due to failed operation [" + + operationHistory.getOperationDefinition().getDisplayName() + "] on " + storageNode.getResource() + + ": " + operationHistory.getErrorMessage()); + newStorageNode.setErrorMessage("Deployment has been aborted due to failed resource operation on " + storageNode.getAddress()); storageNode.setErrorMessage("Deployment of " + newStorageNode.getAddress() + " has been aborted due " + @@ -322,6 +351,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } private void operationFailed(StorageNode newStorageNode, ResourceOperationHistory operationHistory) { + log.error("Deployment has been aborted due to failed operation [" + + operationHistory.getOperationDefinition().getDisplayName() + "] on " + newStorageNode.getResource() + + ": " + operationHistory.getErrorMessage()); + newStorageNode.setErrorMessage("Deployment has been aborted due to failed resource operation [" + operationHistory.getOperationDefinition().getDisplayName() + "]."); newStorageNode.setFailedOperation(operationHistory); @@ -391,28 +424,21 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } private StorageNode findStorageNodeByAddress(String address) { - try { - return entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class) + return entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class) .setParameter("address", address).getSingleResult(); - - } catch (PersistenceException e) { - throw new StorageNodeDeploymentException("Storage node deployment has failed! Failed to fetch the next " + - "storage node at " + address + " to be updated.", e); - } } private StorageNode findNewStorgeNode(StorageNode.OperationMode operationMode) { - try { - return entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class) + return entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class) .setParameter("operationMode", operationMode).getSingleResult(); - } catch (PersistenceException e) { - throw new StorageNodeDeploymentException("Storage node deployment has failed! Failed to fetch the " + - "storage node to be deployed.", e); - } } - private boolean isStorageNodeOperation(OperationDefinition operationDefinition) { - ResourceType resourceType = operationDefinition.getResourceType(); + private boolean isStorageNodeOperation(ResourceOperationHistory operationHistory) { + if (operationHistory == null) { + return false; + } + + ResourceType resourceType = operationHistory.getOperationDefinition().getResourceType(); return resourceType.getName().equals(STORAGE_NODE_TYPE_NAME) && resourceType.getPlugin().equals(STORAGE_NODE_PLUGIN_NAME); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java index 44bb842..83b0ce5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java @@ -7,6 +7,7 @@ import javax.ejb.Asynchronous; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.operation.OperationHistory; +import org.rhq.core.domain.operation.ResourceOperationHistory; /** * @author John Sanda @@ -16,6 +17,12 @@ public interface StorageNodeOperationsHandlerLocal { @Asynchronous void handleOperationUpdateIfNecessary(OperationHistory operationHistory); + void handleUpdateKnownNodes(ResourceOperationHistory operationHistory); + + void handlePrepareForBootstrap(ResourceOperationHistory operationHistory); + + void handleAddNodeMaintenance(ResourceOperationHistory operationHistory); + void announceStorageNode(Subject subject, StorageNode storageNode); void bootstrapStorageNode(Subject subject, StorageNode storageNode); @@ -23,4 +30,6 @@ public interface StorageNodeOperationsHandlerLocal { void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress); void performAddNodeMaintenance(Subject subject, StorageNode storageNode); + + void logError(StorageNode.OperationMode newStorageNodeOperationMode, String error, Exception e); } commit 2089a3788c5bc35de0b81a35c99398c43489ef59 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Aug 14 17:36:23 2013 -0400 capture and log deployment failures that result from failed resource operations diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 34f6381..861e3fa 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -182,7 +182,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN if (log.isInfoEnabled()) { log.info("Scheduling cluster maintenance to deploy " + storageNode + " into the storage cluster..."); } - deployStorageNode(subjectManager.getOverlord(), storageNode.getId()); + deployStorageNode(subjectManager.getOverlord(), storageNode); } } catch (UnknownHostException e) { throw new RuntimeException("Could not resolve address [" + address + "]. The resource " + resource + @@ -233,18 +233,21 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } @Override - public void deployStorageNode(Subject subject, int storageNodeId) { - StorageNode storageNode = entityManager.find(StorageNode.class, storageNodeId); + public void deployStorageNode(Subject subject, StorageNode storageNode) { + storageNode = entityManager.find(StorageNode.class, storageNode.getId()); switch (storageNode.getOperationMode()) { case INSTALLED: case ANNOUNCE: + reset(); storageNodeOperationsHandler.announceStorageNode(subject, storageNode); break; case BOOTSTRAP: + reset(); storageNodeOperationsHandler.bootstrapStorageNode(subject, storageNode); break; case ADD_NODE_MAINTENANCE: + reset(); storageNodeOperationsHandler.performAddNodeMaintenance(subject, storageNode); default: // For any other operation mode, the storage node should already be part of @@ -253,6 +256,13 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } } + private void reset() { + for (StorageNode storageNode : getStorageNodes()) { + storageNode.setErrorMessage(null); + storageNode.setFailedOperation(null); + } + } + private List<StorageNode> combine(List<StorageNode> storageNodes, StorageNode storageNode) { List<StorageNode> newList = new ArrayList<StorageNode>(storageNodes.size() + 1); newList.addAll(storageNodes); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index e5f4f22..75a795c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -169,5 +169,5 @@ public interface StorageNodeManagerLocal { StorageNode createStorageNode(Resource resource); - void deployStorageNode(Subject subject, int storageNodeId); + void deployStorageNode(Subject subject, StorageNode storageNode); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java index 75ac02b..2255299 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java @@ -96,4 +96,6 @@ public interface StorageNodeManagerRemote { * @return all storage nodes alerts */ PageList<Alert> findAllStorageNodeAlerts(Subject subject, StorageNode storageNode); + + void deployStorageNode(Subject sbubject, StorageNode storageNode); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index f996bf2..aaa54f5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -2,10 +2,8 @@ package org.rhq.enterprise.server.storage; import java.net.InetAddress; import java.util.ArrayList; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Set; import javax.ejb.Asynchronous; import javax.ejb.EJB; @@ -23,7 +21,6 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.common.JobTrigger; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.operation.OperationDefinition; @@ -194,15 +191,20 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa // nothing to do here return; case CANCELED: + // TODO Verify whether or not the node has been bootstrapped + // If the operation is canceled the plugin will get an InterruptedException. + // The actual bootstrapping may very well complete so we need to add in some + // checks to find out if the node is up and part of the cluster. + log.error("The operation [prepareForBootstrap] was canceled for " + newStorageNode + ". Deployment of the new storage node cannot proceed."); - // TODO update workflow status (the status needs to be accessible in the UI) + operationCanceled(newStorageNode, resourceOperationHistory); return; case FAILURE: log.error("The operation [preparedForBootstrap] failed for " + newStorageNode + ". The reported " + "failure is: " + resourceOperationHistory.getErrorMessage()); log.error("Deployment of the new storage node cannot proceed."); - // TODO update workflow status (the status needs to be accessible in the UI) + operationFailed(newStorageNode, resourceOperationHistory); return; default: // SUCCESS // Nothing to do because we wait for the C* driver to notify us that the @@ -212,6 +214,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa private void handleUpdateKnownNodes(ResourceOperationHistory resourceOperationHistory) { StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); + StorageNode newStorageNode = null; switch (resourceOperationHistory.getStatus()) { case INPROGRESS: // nothing to do here @@ -219,13 +222,14 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa case CANCELED: log.error("The operation [updateKnownNodes] was canceled for " + storageNode + ". Deployment of the new storage node cannot proceed."); - // TODO update workflow status (the status needs to be accessible in the UI) - return; + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + operationCanceled(storageNode, resourceOperationHistory, newStorageNode); case FAILURE: log.error("The operation [updateKnownNodes] failed for " + storageNode + ". The reported " + "failure is: " + resourceOperationHistory.getErrorMessage()); log.error("Deployment of the new storage node cannot proceed."); - // TODO update workflow status (the status needs to be accessible in the UI) + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + operationFailed(storageNode, resourceOperationHistory, newStorageNode); return; default: // SUCCESS if (log.isInfoEnabled()) { @@ -235,7 +239,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa PropertyList addresses = parameters.getList("addresses"); List<String> remainingNodes = getRemainingNodes(resourceOperationHistory); - StorageNode newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); Subject subject = getSubject(resourceOperationHistory); if (remainingNodes.isEmpty()) { @@ -248,13 +252,9 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } } - private Subject getSubject(ResourceOperationHistory resourceOperationHistory) { - Subject subject = subjectManager.getSubjectByName(resourceOperationHistory.getSubjectName()); - return SessionManager.getInstance().put(subject); - } - private void handleAddNodeMaintenance(ResourceOperationHistory resourceOperationHistory) { StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); + StorageNode newStorageNode = null; switch (resourceOperationHistory.getStatus()) { case INPROGRESS: // nothing to do here @@ -262,13 +262,15 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa case CANCELED: log.error("The operation [addNodeMaintenance] was canceled for " + storageNode + ". This operation " + "needs to be run on each storage node when a new node is added to the cluster."); - // TODO update workflow status (the status needs to be accessible in the UI) + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + operationCanceled(storageNode, resourceOperationHistory, newStorageNode); return; case FAILURE: log.error("The operation [addNodeMaintenance] failed for " + storageNode + ". This operation " + "needs to be run on each storage node when a new node is added to the cluster. The reported " + "failure is: " + resourceOperationHistory.getErrorMessage()); - // TODO update workflow status (the status needs to be accessible in the UI) + newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + operationFailed(storageNode, resourceOperationHistory, newStorageNode); return; default: // SUCCESS if (log.isInfoEnabled()) { @@ -289,6 +291,42 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa } } + private Subject getSubject(ResourceOperationHistory resourceOperationHistory) { + Subject subject = subjectManager.getSubjectByName(resourceOperationHistory.getSubjectName()); + return SessionManager.getInstance().put(subject); + } + + private void operationCanceled(StorageNode storageNode, ResourceOperationHistory operationHistory, + StorageNode newStorageNode) { + newStorageNode.setErrorMessage("Deployment has been aborted due to canceled resource operation on " + + storageNode.getAddress()); + storageNode.setErrorMessage("Deployment of " + newStorageNode.getAddress() + " has been aborted due " + + "to cancellation of resource operation [" + operationHistory.getOperationDefinition().getDisplayName() + + "]."); + storageNode.setFailedOperation(operationHistory); + } + + private void operationCanceled(StorageNode newStorageNode, ResourceOperationHistory operationHistory) { + newStorageNode.setErrorMessage("Deployment has been aborted due to canceled resource operation [" + + operationHistory.getOperationDefinition().getDisplayName() + "]."); + newStorageNode.setFailedOperation(operationHistory); + } + + private void operationFailed(StorageNode storageNode, ResourceOperationHistory operationHistory, + StorageNode newStorageNode) { + newStorageNode.setErrorMessage("Deployment has been aborted due to failed resource operation on " + + storageNode.getAddress()); + storageNode.setErrorMessage("Deployment of " + newStorageNode.getAddress() + " has been aborted due " + + "to failed resource operation [" + operationHistory.getOperationDefinition().getDisplayName() + "]."); + storageNode.setFailedOperation(operationHistory); + } + + private void operationFailed(StorageNode newStorageNode, ResourceOperationHistory operationHistory) { + newStorageNode.setErrorMessage("Deployment has been aborted due to failed resource operation [" + + operationHistory.getOperationDefinition().getDisplayName() + "]."); + newStorageNode.setFailedOperation(operationHistory); + } + private StorageNode findStorageNode(Resource resource) { for (StorageNode storageNode : storageNodeManager.getStorageNodes()) { if (storageNode.getResource().getId() == resource.getId()) { @@ -298,31 +336,6 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return null; } - private StorageNode findStorageNodeToPrepareForBootstrap(PropertyList addressList) { - // It is possible that we could have more that one INSTALLED node. We want to make - // sure we grab the one that was just announced to the cluster. - Set<String> addresses = toSet(addressList); - List<StorageNode> installedNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, - StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.INSTALLED).getResultList(); - - for (StorageNode installedNode : installedNodes) { - if (addresses.contains(installedNode.getAddress())) { - return installedNode; - } - } - // TODO What should we do in the very unlikely event that we do not find the IP address? - throw new IllegalStateException("Failed to find storage node to be bootstrapped."); - } - - private Set<String> toSet(PropertyList propertyList) { - Set<String> set = new HashSet<String>(); - for (Property property : propertyList.getList()) { - PropertySimple simple = (PropertySimple) property; - set.add(simple.getStringValue()); - } - return set; - } - @Override public void bootstrapStorageNode(Subject subject, StorageNode storageNode) { List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, commit 374e65d9c0712316f5650ffa7d5a069933c6b8b3 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Aug 14 16:13:18 2013 -0400 add fields in StorageNode for error reporting during maintenance Storage node deployment and undeployment consists of a series of different resource operations. The (un)deployment work flow could fail due to one of those resource operations. When that occurs we can provide a direct link in the StorageNode.failedOperation field to the operation history of the failed operation. This direct link will help with providing quick insight into the cause of the failure. There is also a new errorMessage field in StorageNode. This field will provide summary info about the failure. If the failure is in server side processing and not in a resource operation, then the errorMessage field should be set but not the failedOperation field. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml index c15aa1f..f307ff8 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml @@ -454,7 +454,9 @@ <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2" /> <column name="CTIME" required="true" type="LONG" /> <column name="MTIME" required="true" type="LONG" /> - <column name="RESOURCE_ID" required="false" type="INTEGER" references="RHQ_RESOURCE(ID)" /> + <column name="ERROR_MSG" required="false" type="LONGVARCHAR"/> + <column name="RESOURCE_ID" required="false" type="INTEGER" references="RHQ_RESOURCE(ID)" /> + <column name="RESOURCE_OP_HIST_ID" required="false" type="INTEGER" references="RHQ_OPERATION_HISTORY(ID)"/>  <index name="RHQ_STORAGE_NODE_UNIQUE" unique="true"> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 6f42345..edf0147 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2184,6 +2184,19 @@ <schema-alterColumn table="RHQ_CONFIG_PD_OSRC" column="EXPRESSION_SCOPE" nullable="false" default="unlimited"/> </schemaSpec> + <schemaSpec version="2.137"> + <schema-addColumn table="RHQ_STORAGE_NODE" column="ERROR_MSG" columnType="LONGVARCHAR"/> + <schema-addColumn table="RHQ_STORAGE_NODE" column="RESOURCE_OP_HIST_ID" columnType="INTEGER"/> + <schema-directSQL> + <statement desc="Creating RHQ_STORAGE_NODE foreign key to RHQ_OPERATION_HISTORY"> + ALTER TABLE RHQ_STORAGE_NODE + ADD CONSTRAINT RHQ_SN_OP_HIST_ID_FK + FOREIGN KEY (RESOURCE_OP_HIST_ID) + REFERENCES RHQ_OPERATION_HISTORY (ID) + </statement> + </schema-directSQL> + </schemaSpec> + </dbupgrade> </target> </project> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 3e94526..3f2a89c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -40,6 +40,7 @@ import javax.persistence.PrePersist; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.resource.Resource; /** @@ -134,10 +135,17 @@ public class StorageNode implements Serializable { @Column(name = "MTIME", nullable = false) private long mtime; + @Column(name = "ERROR_MSG", nullable = true) + private String errorMessage; + @JoinColumn(name = "RESOURCE_ID", referencedColumnName = "ID", nullable = true) @OneToOne(fetch = FetchType.EAGER, optional = true) private Resource resource; + @JoinColumn(name = "RESOURCE_OP_HIST_ID", referencedColumnName = "ID", nullable = true) + @OneToOne(optional = true) + private ResourceOperationHistory failedOperation; + // required for JPA public StorageNode() { } @@ -198,6 +206,22 @@ public class StorageNode implements Serializable { this.resource = resource; } + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public ResourceOperationHistory getFailedOperation() { + return failedOperation; + } + + public void setFailedOperation(ResourceOperationHistory failedOperation) { + this.failedOperation = failedOperation; + } + public OperationMode getOperationMode() { return operationMode; } commit 2b73f4d7f00252b9f4ea71fce47f54458cf683b2 Author: John Sanda <jsanda(a)redhat.com> Date: Wed Aug 14 12:08:13 2013 -0400 refactoring state transitions and adding method for deployment When a storage node is committed into inventory its operation mode is set to INSTALLED, unless the storage node entity exists in which case the mode is set to NORMAL. After creating the storage node entity, deployment is started. The operation mode changs to ANNOUNCE. The address of the new node is announced to existing cluster nodes. After announcing completes, the operation mode changes to BOOTSTRAP, and the prepareForBootstrap operation is run on the new node. When the new node is reported up as part of the cluster, the operation mode of all cluster modes is set to ADD_NODE_MAINTENANCE. The addNodeMaintenance operation is then run on each storage node. When that operation completes, the node's operation mode is set back to NORMAL. The StorageNodeManagerBean.deployStorageNode method looks at the operation mode of the node to determine at what step in the process to start the deployment. The deployStorageNode method is the only method that the UI or remote API will need to invoke to start or resume a deployment. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java index 6a5cf6a..3e94526 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNode.java @@ -209,11 +209,13 @@ public class StorageNode implements Serializable { public enum OperationMode { DOWN("This storage node is down"), // - INSTALLED("This storage node is newly installed but not yet operationial"), // + INSTALLED("This storage node is newly installed but not yet operational"), // MAINTENANCE("This storage node is in maintenance mode"), // NORMAL("This storage node is running normally"), - ANNOUNCE("The storage node is running normally and is being updated to have newly deployed storage nodes " + - "announced to it so that those new nodes can join the cluster."), + ANNOUNCE("The storage node is installed but not yet part of the cluster. It is being announced so that it " + + "can join the cluster."), + BOOTSTRAP("The storage is installed but not yet part of the cluster. It is getting bootstrapped into the " + + "cluster"), ADD_NODE_MAINTENANCE("The storage node is running and is preparing to undergo routine maintenance that is " + "necessary when a new node joins the cluster."); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 11d81b4..34f6381 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -177,21 +177,12 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageNode.setOperationMode(OperationMode.NORMAL); initClusterSettingsIfNecessary(pluginConfig); } else { - storageNode = new StorageNode(); - storageNode.setAddress(address); - storageNode.setCqlPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY))); - storageNode.setJmxPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY))); - storageNode.setResource(resource); - storageNode.setOperationMode(OperationMode.INSTALLED); - - entityManager.persist(storageNode); + storageNode = createStorageNode(resource); if (log.isInfoEnabled()) { - log.info(storageNode + " is a new storage node and not part of the storage node cluster."); - log.info("Scheduling maintenance operations to bring " + storageNode + " into the cluster..."); + log.info("Scheduling cluster maintenance to deploy " + storageNode + " into the storage cluster..."); } - - announceNewNode(storageNode); + deployStorageNode(subjectManager.getOverlord(), storageNode.getId()); } } catch (UnknownHostException e) { throw new RuntimeException("Could not resolve address [" + address + "]. The resource " + resource + @@ -224,17 +215,42 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageClusterSettingsManager.setClusterSettings(subjectManager.getOverlord(), clusterSettings); } - private void announceNewNode(StorageNode newStorageNode) { - if (log.isInfoEnabled()) { - log.info("Announcing " + newStorageNode + " to storage node cluster."); - } + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public StorageNode createStorageNode(Resource resource) { + Configuration pluginConfig = resource.getPluginConfiguration(); + + StorageNode storageNode = new StorageNode(); + storageNode.setAddress(pluginConfig.getSimpleValue(RHQ_STORAGE_ADDRESS_PROPERTY)); + storageNode.setCqlPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_CQL_PORT_PROPERTY))); + storageNode.setJmxPort(Integer.parseInt(pluginConfig.getSimpleValue(RHQ_STORAGE_JMX_PORT_PROPERTY))); + storageNode.setResource(resource); + storageNode.setOperationMode(OperationMode.INSTALLED); - List<StorageNode> clusteredNodes = getClusteredStorageNodes(); - for (StorageNode node : clusteredNodes) { - node.setOperationMode(OperationMode.ANNOUNCE); + entityManager.persist(storageNode); + + return storageNode; + } + + @Override + public void deployStorageNode(Subject subject, int storageNodeId) { + StorageNode storageNode = entityManager.find(StorageNode.class, storageNodeId); + + switch (storageNode.getOperationMode()) { + case INSTALLED: + case ANNOUNCE: + storageNodeOperationsHandler.announceStorageNode(subject, storageNode); + break; + case BOOTSTRAP: + storageNodeOperationsHandler.bootstrapStorageNode(subject, storageNode); + break; + case ADD_NODE_MAINTENANCE: + storageNodeOperationsHandler.performAddNodeMaintenance(subject, storageNode); + default: + // For any other operation mode, the storage node should already be part of + // the cluster. + // TODO Make sure that the storage node is in fact part of the cluster } - PropertyList addresses = createPropertyListOfAddresses("addresses", combine(clusteredNodes, newStorageNode)); - storageNodeOperationsHandler.announceNewStorageNode(newStorageNode, clusteredNodes.get(0), addresses); } private List<StorageNode> combine(List<StorageNode> storageNodes, StorageNode storageNode) { @@ -254,12 +270,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN } @Override - public boolean isAddNodeMaintenanceInProgress() { - return !entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE) - .setParameter("operationMode", OperationMode.ADD_NODE_MAINTENANCE).getResultList().isEmpty(); - } - - @Override @RequiredPermission(Permission.MANAGE_SETTINGS) public StorageNodeLoadComposite getLoad(Subject subject, StorageNode node, long beginTime, long endTime) { int resourceId = getResourceIdFromStorageNode(node); @@ -418,11 +428,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return result; } - private List<StorageNode> getClusteredStorageNodes() { - return entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class) - .setParameter("operationMode", OperationMode.NORMAL).getResultList(); - } - @Override @RequiredPermission(Permission.MANAGE_SETTINGS) public PageList<StorageNode> findStorageNodesByCriteria(Subject subject, StorageNodeCriteria criteria) { @@ -796,4 +801,4 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return successResultFound; } -} \ No newline at end of file +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index b5ee7f0..e5f4f22 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -167,5 +167,7 @@ public interface StorageNodeManagerLocal { Map<String, List<MeasurementDataNumericHighLowComposite>> findStorageNodeLoadDataForLast(Subject subject, StorageNode node, long beginTime, long endTime, int numPoints); - boolean isAddNodeMaintenanceInProgress(); + StorageNode createStorageNode(Resource resource); + + void deployStorageNode(Subject subject, int storageNodeId); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java index 734da35..7db95fb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMonitor.java @@ -7,7 +7,6 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.server.metrics.StorageStateListener; @@ -30,12 +29,8 @@ public class StorageClusterMonitor implements StorageStateListener { isClusterAvailable = true; - StorageNodeManagerLocal storageNodeManager = LookupUtil.getStorageNodeManager(); - if (storageNodeManager.isAddNodeMaintenanceInProgress()) { - log.info("Scheduling cluster maintenance..."); - StorageNodeOperationsHandlerLocal storageOperationsHandler = LookupUtil.getStorageNodeOperationsHandler(); - storageOperationsHandler.performAddNodeMaintenance(address); - } + StorageNodeOperationsHandlerLocal storageOperationsHandler = LookupUtil.getStorageNodeOperationsHandler(); + storageOperationsHandler.performAddNodeMaintenanceIfNecessary(address); } @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java new file mode 100644 index 0000000..fca6e96 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeDeploymentException.java @@ -0,0 +1,22 @@ +package org.rhq.enterprise.server.storage; + +/** + * @author John Sanda + */ +public class StorageNodeDeploymentException extends RuntimeException { + + public StorageNodeDeploymentException() { + } + + public StorageNodeDeploymentException(String message) { + super(message); + } + + public StorageNodeDeploymentException(String message, Throwable cause) { + super(message, cause); + } + + public StorageNodeDeploymentException(Throwable cause) { + super(cause); + } +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index 1bf3cec..f996bf2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -1,15 +1,20 @@ package org.rhq.enterprise.server.storage; import java.net.InetAddress; +import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.ejb.Asynchronous; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import javax.persistence.PersistenceException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,6 +34,7 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.util.StringUtil; import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.auth.SessionManager; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; @@ -69,39 +75,72 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa private StorageClientManagerBean storageClientManager; @Override - public void announceNewStorageNode(StorageNode newStorageNode, StorageNode clusterNode, PropertyList addresses) { + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void announceStorageNode(Subject subject, StorageNode storageNode) { if (log.isInfoEnabled()) { - log.info("Announcing new storage node " + newStorageNode + " to cluster node " + clusterNode); + log.info("Announcing " + storageNode + " to storage node cluster."); + } + storageNode.setOperationMode(StorageNode.OperationMode.ANNOUNCE); + List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, + StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL).getResultList(); + List<StorageNode> allNodes = new ArrayList<StorageNode>(clusterNodes); + allNodes.add(storageNode); + + announceStorageNode(subject, storageNode, createPropertyListOfAddresses("addresses", allNodes), + getAddresses(clusterNodes)); + + } + + private void announceStorageNode(Subject subject, StorageNode storageNode, PropertyList addresses, + List<String> remainingNodes) { + String address = remainingNodes.remove(0); + StorageNode clusterNode = findStorageNodeByAddress(address); + + if (log.isInfoEnabled()) { + log.info("Announcing " + storageNode + " to cluster node " + clusterNode); } - Subject overlord = subjectManager.getOverlord(); ResourceOperationSchedule schedule = new ResourceOperationSchedule(); schedule.setResource(clusterNode.getResource()); schedule.setJobTrigger(JobTrigger.createNowTrigger()); - schedule.setSubject(overlord); + schedule.setSubject(subject); schedule.setOperationName("updateKnownNodes"); Configuration parameters = new Configuration(); parameters.put(addresses); + parameters.put(new PropertySimple("remainingNodes", StringUtil.listToString(remainingNodes))); schedule.setParameters(parameters); - operationManager.scheduleResourceOperation(overlord, schedule); + operationManager.scheduleResourceOperation(subject, schedule); } @Override - public void performAddNodeMaintenance(InetAddress storageNodeAddress) { + public void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress) { StorageNode storageNode = entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class).setParameter("address", storageNodeAddress.getHostAddress()).getSingleResult(); - storageNode.setOperationMode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + if (storageNode.getOperationMode() == StorageNode.OperationMode.BOOTSTRAP) { + performAddNodeMaintenance(subjectManager.getOverlord(), storageNode); + } else { + log.info(storageNode + " has already been bootstrapped. Skipping add node maintenance."); + } + } + + @Override + public void performAddNodeMaintenance(Subject subject, StorageNode storageNode) { + storageNode.setOperationMode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, - StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.ADD_NODE_MAINTENANCE) + StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL) .getResultList(); - + for (StorageNode node : clusterNodes) { + node.setOperationMode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); + } + clusterNodes.add(storageNode); boolean runRepair = updateSchemaIfNecessary(clusterNodes); - - performAddNodeMaintenance(storageNode, runRepair, createPropertyListOfAddresses(SEEDS_LIST, clusterNodes)); + performAddNodeMaintenance(subject, storageNode, runRepair, createPropertyListOfAddresses(SEEDS_LIST, + clusterNodes)); } - private void performAddNodeMaintenance(StorageNode storageNode, boolean runRepair, PropertyList seedsList) { + private void performAddNodeMaintenance(Subject subject, StorageNode storageNode, boolean runRepair, + PropertyList seedsList) { if (log.isInfoEnabled()) { log.info("Running addNodeMaintenance for storage node " + storageNode); } @@ -111,7 +150,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa ResourceOperationSchedule schedule = new ResourceOperationSchedule(); schedule.setResource(storageNode.getResource()); schedule.setJobTrigger(JobTrigger.createNowTrigger()); - schedule.setSubject(overlord); + schedule.setSubject(subject); schedule.setOperationName("addNodeMaintenance"); Configuration config = new Configuration(); @@ -192,22 +231,28 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa if (log.isInfoEnabled()) { log.info("Finished announcing cluster nodes to " + storageNode); } - storageNode.setOperationMode(StorageNode.OperationMode.ADD_NODE_MAINTENANCE); Configuration parameters = resourceOperationHistory.getParameters(); PropertyList addresses = parameters.getList("addresses"); - StorageNode nextNode = takeFromQueue(storageNode, StorageNode.OperationMode.ANNOUNCE); + List<String> remainingNodes = getRemainingNodes(resourceOperationHistory); - if (nextNode == null) { + StorageNode newStorageNode = findNewStorgeNode(StorageNode.OperationMode.ANNOUNCE); + Subject subject = getSubject(resourceOperationHistory); + + if (remainingNodes.isEmpty()) { log.info("Successfully announced new storage node to cluster"); - StorageNode installedNode = findStorageNodeToPrepareForBootstrap(addresses); - // Pass a copy of addresses to avoid a TransientObjectException - prepareNodeForBootstrap(installedNode, addresses.deepCopy(false)); + newStorageNode.setOperationMode(StorageNode.OperationMode.BOOTSTRAP); + prepareNodeForBootstrap(subject, newStorageNode, addresses.deepCopy(false)); } else { - announceNewStorageNode(storageNode, nextNode, addresses.deepCopy(false)); + announceStorageNode(subject, newStorageNode, addresses.deepCopy(false), remainingNodes); } } } + private Subject getSubject(ResourceOperationHistory resourceOperationHistory) { + Subject subject = subjectManager.getSubjectByName(resourceOperationHistory.getSubjectName()); + return SessionManager.getInstance().put(subject); + } + private void handleAddNodeMaintenance(ResourceOperationHistory resourceOperationHistory) { StorageNode storageNode = findStorageNode(resourceOperationHistory.getResource()); switch (resourceOperationHistory.getStatus()) { @@ -238,7 +283,8 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa Configuration parameters = resourceOperationHistory.getParameters(); boolean runRepair = parameters.getSimple(RUN_REPAIR_PROPERTY).getBooleanValue(); PropertyList seedsList = parameters.getList(SEEDS_LIST).deepCopy(false); - performAddNodeMaintenance(nextNode, runRepair, seedsList); + Subject subject = getSubject(resourceOperationHistory); + performAddNodeMaintenance(subject, nextNode, runRepair, seedsList); } } } @@ -277,7 +323,15 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return set; } - private void prepareNodeForBootstrap(StorageNode storageNode, PropertyList addresses) { + @Override + public void bootstrapStorageNode(Subject subject, StorageNode storageNode) { + List<StorageNode> clusterNodes = entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, + StorageNode.class).setParameter("operationMode", StorageNode.OperationMode.NORMAL).getResultList(); + clusterNodes.add(storageNode); + prepareNodeForBootstrap(subject, storageNode, createPropertyListOfAddresses("addresses", clusterNodes)); + } + + private void prepareNodeForBootstrap(Subject subject, StorageNode storageNode, PropertyList addresses) { if (log.isInfoEnabled()) { log.info("Preparing to bootstrap " + storageNode + " into cluster..."); } @@ -285,11 +339,10 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa ResourceOperationSchedule schedule = new ResourceOperationSchedule(); schedule.setResource(storageNode.getResource()); schedule.setJobTrigger(JobTrigger.createNowTrigger()); - schedule.setSubject(subjectManager.getOverlord()); + schedule.setSubject(subject); schedule.setOperationName("prepareForBootstrap"); - StorageClusterSettings clusterSettings = storageClusterSettingsManager.getClusterSettings( - subjectManager.getOverlord()); + StorageClusterSettings clusterSettings = storageClusterSettingsManager.getClusterSettings(subject); Configuration parameters = new Configuration(); parameters.put(new PropertySimple("cqlPort", clusterSettings.getCqlPort())); parameters.put(new PropertySimple("gossipPort", clusterSettings.getGossipPort())); @@ -297,7 +350,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa schedule.setParameters(parameters); - operationManager.scheduleResourceOperation(subjectManager.getOverlord(), schedule); + operationManager.scheduleResourceOperation(subject, schedule); } private StorageNode takeFromQueue(StorageNode lastTaken, StorageNode.OperationMode queue) { @@ -311,6 +364,40 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return nodes.get(0); } + private List<String> getRemainingNodes(ResourceOperationHistory resourceOperationHistory) { + LinkedList<String> addresses = new LinkedList<String>(); + Configuration results = resourceOperationHistory.getResults(); + String remainingNodes = results.getSimpleValue("remainingNodes"); + + if (!StringUtil.isEmpty(remainingNodes)) { + for (String address : remainingNodes.split(",")) { + addresses.add(address); + } + } + return addresses; + } + + private StorageNode findStorageNodeByAddress(String address) { + try { + return entityManager.createNamedQuery(StorageNode.QUERY_FIND_BY_ADDRESS, StorageNode.class) + .setParameter("address", address).getSingleResult(); + + } catch (PersistenceException e) { + throw new StorageNodeDeploymentException("Storage node deployment has failed! Failed to fetch the next " + + "storage node at " + address + " to be updated.", e); + } + } + + private StorageNode findNewStorgeNode(StorageNode.OperationMode operationMode) { + try { + return entityManager.createNamedQuery(StorageNode.QUERY_FIND_ALL_BY_MODE, StorageNode.class) + .setParameter("operationMode", operationMode).getSingleResult(); + } catch (PersistenceException e) { + throw new StorageNodeDeploymentException("Storage node deployment has failed! Failed to fetch the " + + "storage node to be deployed.", e); + } + } + private boolean isStorageNodeOperation(OperationDefinition operationDefinition) { ResourceType resourceType = operationDefinition.getResourceType(); return resourceType.getName().equals(STORAGE_NODE_TYPE_NAME) && @@ -411,4 +498,12 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa return list; } + private List<String> getAddresses(List<StorageNode> storageNodes) { + List<String> addresses = new LinkedList<String>(); + for (StorageNode storageNode : storageNodes) { + addresses.add(storageNode.getAddress()); + } + return addresses; + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java index fcdcd3e..44bb842 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java @@ -4,8 +4,8 @@ import java.net.InetAddress; import javax.ejb.Asynchronous; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.StorageNode; -import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.operation.OperationHistory; /** @@ -16,7 +16,11 @@ public interface StorageNodeOperationsHandlerLocal { @Asynchronous void handleOperationUpdateIfNecessary(OperationHistory operationHistory); - void announceNewStorageNode(StorageNode newStorageNode, StorageNode clusterNode, PropertyList addresses); + void announceStorageNode(Subject subject, StorageNode storageNode); - void performAddNodeMaintenance(InetAddress storageNodeAddress); + void bootstrapStorageNode(Subject subject, StorageNode storageNode); + + void performAddNodeMaintenanceIfNecessary(InetAddress storageNodeAddress); + + void performAddNodeMaintenance(Subject subject, StorageNode storageNode); } diff --git a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java index e76cfa0..7f58037 100644 --- a/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java +++ b/modules/plugins/rhq-storage/src/main/java/org/rhq/plugins/storage/StorageNodeComponent.java @@ -255,7 +255,9 @@ public class StorageNodeComponent extends CassandraNodeComponent implements Oper EmsOperation emsOperation = authBean.getOperation("reloadConfiguration"); emsOperation.invoke(); - result.setSimpleResult("Successfully updated the set of known nodes."); + Configuration complexResults = result.getComplexResults(); + complexResults.put(new PropertySimple("details", "Successfully updated the set of known nodes.")); + complexResults.put(params.get("remainingNodes").deepCopy(false)); return result; } catch (InternodeAuthConfUpdateException e) { diff --git a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml index a2d04d0..4ef10cd 100644 --- a/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml @@ -102,7 +102,12 @@ <c:list-property name="addresses"> <c:simple-property name="address"/> </c:list-property> + <c:simple-property name="remainingNodes"/> </parameters> + <results> + <c:simple-property name="details"/> + <c:simple-property name="remainingNodes"/> + </results> </operation> <operation name="prepareForBootstrap">

1 0

[rhq] modules/enterprise
by snegrea 14 Aug '13

14 Aug '13

modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 43 ++++++++++ 1 file changed, 43 insertions(+) New commits: commit a895379f5bc41c0d4f2c67dfb391fe8ecc99f7ea Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 14 17:58:32 2013 -0500 Add alert template for maintenance operation failures for storage nodes. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index f752d1d..5692bea 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -66,11 +66,14 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone private static final String TOTAL_DISK_USED_PERCENTAGE_METRIC_NAME = "Calculated.TotalDiskUsedPercentage"; private static final String FREE_DISK_TO_DATA_SIZE_RATIO_METRIC_NAME = "Calculated.FreeDiskToDataSizeRatio"; private static final String TAKE_SNAPSHOT_OPERATION_NAME = "takeSnapshot"; + private static final String[] MAINTENANCE_OPERATIONS = new String[] { "readRepair", "addNodeMaintenance", + "updateKnownNodes", "prepareForBootstrap", "prepareForUpgrade", "updateSeedsList", "updateConfiguration" }; static private final List<InjectedTemplate> injectedTemplates; static private final InjectedTemplate storageNodeHighHeapTemplate; static private final InjectedTemplate storageNodeHighDiskUsageTemplate; static private final InjectedTemplate storageNodeSnapshotFailureTemplate; + static private final InjectedTemplate storageNodeMaintenanceOperationsFailureTemplate; static { storageNodeHighHeapTemplate = new InjectedTemplate( @@ -91,10 +94,18 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone "StorageNodeSnapshotFailureTemplate", // "An alert template to notify users when a snapshot operations fails for an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + storageNodeMaintenanceOperationsFailureTemplate = new InjectedTemplate( + "RHQStorage", // + "RHQ Storage Node", // + "StorageNodeMaintenanceOperationsFailureTemplate", // + "An alert template to notify users when a maintenance operation fails for an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + injectedTemplates = new ArrayList<InjectedTemplate>(); injectedTemplates.add(storageNodeHighHeapTemplate); injectedTemplates.add(storageNodeHighDiskUsageTemplate); injectedTemplates.add(storageNodeSnapshotFailureTemplate); + injectedTemplates.add(storageNodeMaintenanceOperationsFailureTemplate); + } private ServerPluginContext context; @@ -239,6 +250,8 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newAlertDefId = injectStorageNodeHighDiskUsageTemplate(resourceType); } else if (storageNodeSnapshotFailureTemplate.equals(injectedAlertDef)) { newAlertDefId = injectStorageNodeSnapshotFailureTemplate(resourceType); + } else if (storageNodeMaintenanceOperationsFailureTemplate.equals(injectedAlertDef)) { + newAlertDefId = injectStorageNodeMaintenanceOperationsFailureTemplate(resourceType); } adc.addFilterId(newAlertDefId); @@ -398,6 +411,36 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone return newTemplateId; } + private int injectStorageNodeMaintenanceOperationsFailureTemplate(ResourceType resourceType) { + AlertTemplateManagerLocal alertTemplateManager = LookupUtil.getAlertTemplateManager(); + SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); + + AlertDefinition newTemplate = new AlertDefinition(); + newTemplate.setName(storageNodeMaintenanceOperationsFailureTemplate.getName()); + newTemplate.setResourceType(resourceType); + newTemplate.setPriority(AlertPriority.MEDIUM); + newTemplate.setConditionExpression(BooleanExpression.ANY); + newTemplate.setDescription(storageNodeMaintenanceOperationsFailureTemplate.getDescription()); + newTemplate.setRecoveryId(0); + newTemplate.setEnabled(true); + + for (String operation : MAINTENANCE_OPERATIONS) { + AlertCondition snapshotFailureCondition = new AlertCondition(); + snapshotFailureCondition.setCategory(AlertConditionCategory.CONTROL); + snapshotFailureCondition.setName(operation); + snapshotFailureCondition.setOption(OperationRequestStatus.FAILURE.name()); + newTemplate.addCondition(snapshotFailureCondition); + } + + AlertDampening dampener = new AlertDampening(AlertDampening.Category.NONE); + newTemplate.setAlertDampening(dampener); + + int newTemplateId = alertTemplateManager.createAlertTemplate(subjectManager.getOverlord(), newTemplate, + resourceType.getId()); + + return newTemplateId; + } + private static class InjectedTemplate { static public final String FIELD_PLUGIN_NAME = "plugin"; static public final String FIELD_RESOURCE_TYPE_NAME = "type";

1 0

[rhq] Branch 'feature/bundle-gui' - modules/enterprise
by mazz 14 Aug '13

14 Aug '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 187 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 25 + 3 files changed, 157 insertions(+), 58 deletions(-) New commits: commit d5cf338a0083ef6e57fd4f40c205e484966f6e60 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Aug 14 17:30:53 2013 -0400 initial coding of the bundle left hand tree to support bundle groups. this is not fully complete yet, but is almost there. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java index 4cf3f0f..d232576 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java @@ -80,8 +80,7 @@ public class BundleTopView extends EnhancedHLayout implements BookmarkableView { sectionStack.setHeight100(); SectionStackSection bundlesSection = new SectionStackSection(MSG.common_title_bundles()); - // TODO: Need to fix perm stuff in tree view - bundleTreeView = new BundleTreeView(true); + bundleTreeView = new BundleTreeView(); bundlesSection.addItem(bundleTreeView); sectionStack.addSection(bundlesSection); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java index 49e7f31..fbfa34c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java @@ -24,7 +24,9 @@ package org.rhq.enterprise.gui.coregui.client.bundle.tree; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Set; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; @@ -38,6 +40,7 @@ import com.smartgwt.client.widgets.tree.TreeNode; import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.bundle.BundleDeployment; import org.rhq.core.domain.bundle.BundleDestination; +import org.rhq.core.domain.bundle.BundleGroup; import org.rhq.core.domain.bundle.BundleVersion; import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.criteria.BundleDeploymentCriteria; @@ -53,15 +56,14 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; /** * @author Greg Hinkle + * @author John Mazzitelli */ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { - private BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService(); - private final boolean canManageBundles; + private final BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService(); - public BundleTreeDataSource(boolean canManageBundles) { + public BundleTreeDataSource() { super(); - this.canManageBundles = canManageBundles; List<DataSourceField> fields = addDataSourceFields(); addFields(fields); } @@ -88,14 +90,14 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { @Override protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) { - String p = request.getCriteria().getAttribute("parentId"); + final String parentId = request.getCriteria().getAttribute("parentId"); - if (p == null) { + if (parentId == null) { // there is no parent - we are at the root of the tree - // get the top nodes (the bundles) + // get the bundles and build the bundle groups (including unassigned) from that BundleCriteria criteria = new BundleCriteria(); - criteria.fetchDestinations(true); + criteria.fetchBundleGroups(true); bundleService.findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { public void onFailure(Throwable caught) { @@ -105,17 +107,54 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { } public void onSuccess(PageList<Bundle> result) { - response.setData(buildRecords(result)); - response.setTotalRows(result.getTotalSize()); + BundleGroup unassignedBundleGroup = new BundleGroup(); + unassignedBundleGroup.setId(0); // ID=0 is an indicator we use to denote the unassigned group + unassignedBundleGroup.setName("TODO i18n Unassigned Bundles"); + unassignedBundleGroup.setDescription("TODO i18n These are bundles that are not assigned to any bundle group."); + + // Because findBundleGroupsByCriteria would not have given us all unassigned bundles, we used + // findBundlesByCriteria. But we need to organize our tree structure with groups at the top, so + // we need to put our results aggregated in groups. + HashMap<Integer, BundleGroup> visibleBundleGroups = new HashMap<Integer, BundleGroup>(); + for (Bundle bundle : result) { + Set<BundleGroup> bundleBundleGroups = bundle.getBundleGroups(); + if (bundleBundleGroups == null || bundleBundleGroups.isEmpty()) { + unassignedBundleGroup.addBundle(bundle); + } else { + for (BundleGroup bundleBundleGroup : bundleBundleGroups) { + BundleGroup theGroup = visibleBundleGroups.get(bundleBundleGroup.getId()); + if (theGroup == null) { + visibleBundleGroups.put(bundleBundleGroup.getId(), bundleBundleGroup); + theGroup = bundleBundleGroup; + } + theGroup.addBundle(bundle); + } + } + } + + ArrayList<BundleGroup> allVisibleBundleGroups = new ArrayList<BundleGroup>(visibleBundleGroups.values()); + if (!unassignedBundleGroup.getBundles().isEmpty()) { + allVisibleBundleGroups.add(unassignedBundleGroup); + } + response.setData(buildRecords(allVisibleBundleGroups)); + response.setTotalRows(allVisibleBundleGroups.size()); processResponse(request.getRequestId(), response); } }); } else { + String[] splitParentId = parentId.split("_", 3); // <bundleGroupId>_<bundleId>_<and the rest> + final Integer bundleGroupId = Integer.parseInt(splitParentId[0]); + Integer tmp; + try { + tmp = Integer.parseInt(splitParentId[1]); + } catch (NumberFormatException e) { + tmp = null; + } + final Integer bundleId = tmp; // we are at an inner node, being asked to get the children of it - if (p.endsWith("_versions")) { - int bundleId = Integer.parseInt(p.substring(0, p.indexOf("_"))); + if (parentId.endsWith("_versions")) { BundleVersionCriteria criteria = new BundleVersionCriteria(); criteria.addFilterBundleId(bundleId); bundleService.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { @@ -126,31 +165,29 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { } public void onSuccess(PageList<BundleVersion> result) { - response.setData(buildRecords(result)); + response.setData(buildRecordsForKnownBundle(result, bundleGroupId, bundleId)); response.setTotalRows(result.getTotalSize()); processResponse(request.getRequestId(), response); } }); - } else if (p.endsWith("_deployments")) { - int bundleId = Integer.parseInt(p.substring(0, p.indexOf("_"))); + } else if (parentId.endsWith("_deployments")) { BundleDeploymentCriteria criteria = new BundleDeploymentCriteria(); criteria.fetchBundleVersion(true); criteria.addFilterBundleId(bundleId); bundleService.findBundleDeploymentsByCriteria(criteria, - new AsyncCallback<PageList<BundleDeployment>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); - } - - public void onSuccess(PageList<BundleDeployment> result) { - response.setData(buildRecords(result)); - processResponse(request.getRequestId(), response); - } - }); - - } else if (p.endsWith("_destinations")) { - final int bundleId = Integer.parseInt(p.substring(0, p.indexOf("_"))); + new AsyncCallback<PageList<BundleDeployment>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); + } + + public void onSuccess(PageList<BundleDeployment> result) { + response.setData(buildRecordsForKnownBundle(result, bundleGroupId, bundleId)); + processResponse(request.getRequestId(), response); + } + }); + + } else if (parentId.endsWith("_destinations")) { BundleDestinationCriteria criteria = new BundleDestinationCriteria(); criteria.addFilterBundleId(bundleId); criteria.fetchDeployments(true); @@ -161,10 +198,29 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { } public void onSuccess(PageList<BundleDestination> result) { - response.setData(buildRecordsForKnownBundle(result, bundleId)); + response.setData(buildRecordsForKnownBundle(result, bundleGroupId, bundleId)); processResponse(request.getRequestId(), response); } }); + } else { + // we are at a child node under a bundle node - its an individual destination or deployment node + BundleCriteria criteria = new BundleCriteria(); + criteria.addFilterId(bundleId); + criteria.fetchDestinations(true); + + bundleService.findBundlesByCriteria(criteria, new AsyncCallback<PageList<Bundle>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_tree_loadFailure(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + + public void onSuccess(PageList<Bundle> result) { + final ListGridRecord[] listGridRecordsData = buildRecordsForKnownBundle(result, bundleGroupId, bundleId); + response.setData(listGridRecordsData); + processResponse(request.getRequestId(), response); + } + }); } } } @@ -183,10 +239,10 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { @Override public ListGridRecord[] buildRecords(Collection dataObjects) { - return buildRecordsForKnownBundle(dataObjects, null); + return buildRecordsForKnownBundle(dataObjects, null, null); } - public ListGridRecord[] buildRecordsForKnownBundle(Collection dataObjects, Integer bundleId) { + private ListGridRecord[] buildRecordsForKnownBundle(Collection dataObjects, Integer bundleGroupId, Integer bundleId) { if (dataObjects == null) { return null; } @@ -196,34 +252,53 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { for (Object item : dataObjects) { // the resultant item is a direct node to build - records.add(copyValues(item)); + records.add(copyValuesForKnownBundle(item, bundleGroupId, bundleId)); // now build the children of the node - if (item instanceof Bundle) { + if (item instanceof BundleGroup) { + BundleGroup bundleGroup = (BundleGroup) item; + Set<Bundle> bundles = bundleGroup.getBundles(); + if (bundles != null) { + for (Bundle bundle : bundles) { + records.add(copyValuesForKnownBundle(bundle, bundleGroup.getId(), bundle.getId())); + // while we are here, automatically add the two direct children - the versions and destinations folders + TreeNode versionNode = new TreeNode(MSG.view_bundle_versions()); + versionNode.setID(bundleGroup.getId() + "_" + bundle.getId() + "_versions"); + versionNode.setParentID(bundleGroup.getId() + "_" + bundle.getId()); + versionNode.setName(MSG.view_bundle_versions()); + records.add(versionNode); + + TreeNode deploymentsNode = new TreeNode(MSG.view_bundle_destinations()); + deploymentsNode.setID(bundleGroup.getId() + "_" + bundle.getId() + "_destinations"); + deploymentsNode.setParentID(bundleGroup.getId() + "_" + bundle.getId()); + deploymentsNode.setName(MSG.view_bundle_destinations()); + records.add(deploymentsNode); + } + } + + } else if (item instanceof Bundle) { Bundle bundle = (Bundle) item; // each bundle has two direct children - the versions and destinations folders TreeNode versionNode = new TreeNode(MSG.view_bundle_versions()); - versionNode.setID(bundle.getId() + "_versions"); - versionNode.setParentID(String.valueOf(bundle.getId())); + versionNode.setID(bundleGroupId.toString() + "_" + bundle.getId() + "_versions"); + versionNode.setParentID(bundleGroupId.toString() + "_" + bundle.getId()); versionNode.setName(MSG.view_bundle_versions()); - versionNode.setAttribute("name", MSG.view_bundle_versions()); records.add(versionNode); TreeNode deploymentsNode = new TreeNode(MSG.view_bundle_destinations()); - deploymentsNode.setID(bundle.getId() + "_destinations"); - deploymentsNode.setParentID(String.valueOf(bundle.getId())); + deploymentsNode.setID(bundleGroupId.toString() + "_" + bundle.getId() + "_destinations"); + deploymentsNode.setParentID(bundleGroupId.toString() + "_" + bundle.getId()); deploymentsNode.setName(MSG.view_bundle_destinations()); records.add(deploymentsNode); + } else if (item instanceof BundleDestination) { - if (canManageBundles) { - BundleDestination dest = (BundleDestination) item; + BundleDestination dest = (BundleDestination) item; - // each destination has 0, 1 or more deployments - if (dest.getDeployments() != null) { - for (BundleDeployment deploy : dest.getDeployments()) { - records.add(copyValuesForKnownBundle(deploy, bundleId)); - } + // each destination has 0, 1 or more deployments + if (dest.getDeployments() != null) { + for (BundleDeployment deploy : dest.getDeployments()) { + records.add(copyValuesForKnownBundle(deploy, bundleGroupId, bundleId)); } } } @@ -233,24 +308,32 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { @Override public ListGridRecord copyValues(Object from) { - return copyValuesForKnownBundle(from, null); + return copyValuesForKnownBundle(from, null, null); } - public ListGridRecord copyValuesForKnownBundle(Object from, Integer bundleId) { + private ListGridRecord copyValuesForKnownBundle(Object from, Integer bundleGroupId, Integer bundleId) { String parentID; TreeNode node = new TreeNode(); - if (from instanceof Bundle) { + if (from instanceof BundleGroup) { + BundleGroup bundleGroup = (BundleGroup) from; + node.setIsFolder(true); + node.setIcon("subsystems/bundle/BundleGroup_16.png"); + node.setID(String.valueOf(bundleGroup.getId())); + node.setName(StringUtility.escapeHtml(bundleGroup.getName())); + + } else if (from instanceof Bundle) { Bundle bundle = (Bundle) from; node.setIsFolder(true); node.setIcon("subsystems/bundle/Bundle_16.png"); - node.setID(String.valueOf(bundle.getId())); + node.setID(String.valueOf(bundleGroupId) + "_" + bundle.getId()); + node.setParentID(String.valueOf(bundleGroupId)); node.setName(StringUtility.escapeHtml(bundle.getName())); } else if (from instanceof BundleVersion) { BundleVersion version = (BundleVersion) from; node.setIsFolder(false); node.setIcon("subsystems/bundle/BundleVersion_16.png"); - parentID = version.getBundle().getId() + "_versions"; + parentID = bundleGroupId.toString() + "_" + version.getBundle().getId() + "_versions"; node.setParentID(parentID); node.setID(parentID + '_' + version.getId()); node.setName(version.getVersion()); @@ -259,7 +342,7 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { BundleDeployment deployment = (BundleDeployment) from; node.setIsFolder(false); node.setIcon("subsystems/bundle/BundleDeployment_16.png"); - parentID = bundleId + "_destinations_" + deployment.getDestination().getId(); + parentID = bundleGroupId.toString() + "_" + bundleId + "_destinations_" + deployment.getDestination().getId(); node.setParentID(parentID); node.setID(bundleId + "_deployments_" + deployment.getId()); String name = StringUtility.escapeHtml(deployment.getName()); @@ -273,7 +356,7 @@ public class BundleTreeDataSource extends RPCDataSource<Object, Criteria> { BundleDestination destination = (BundleDestination) from; node.setIsFolder(true); node.setIcon("subsystems/bundle/BundleDestination_16.png"); - parentID = destination.getBundle().getId() + "_destinations"; + parentID = bundleGroupId.toString() + "_" + destination.getBundle().getId() + "_destinations"; node.setParentID(parentID); node.setID(parentID + '_' + destination.getId()); node.setName(StringUtility.escapeHtml(destination.getName())); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java index 242f0ef..df01fda 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java @@ -39,6 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; /** * @author Greg Hinkle + * @author John Mazzitelli */ public class BundleTreeView extends TreeGrid { @@ -46,12 +47,14 @@ public class BundleTreeView extends TreeGrid { // If so, hold it here and retry after the datasource pulls the data. private ViewPath pendingPath = null; - public BundleTreeView(boolean canManageBundles) { + private Integer currentlySelectedBundleGroupId; + + public BundleTreeView() { super(); setWidth100(); setHeight100(); setLeaveScrollbarGap(false); - // fetch the top bundle nodes at the inital onDraw() + // fetch the top bundle group nodes at the inital onDraw() setAutoFetchData(true); setAnimateFolders(false); setSelectionType(SelectionStyle.SINGLE); @@ -59,13 +62,27 @@ public class BundleTreeView extends TreeGrid { setSortField("name"); setShowHeader(false); - setDataSource(new BundleTreeDataSource(canManageBundles)); + setDataSource(new BundleTreeDataSource()); addNodeClickHandler(new NodeClickHandler() { public void onNodeClick(NodeClickEvent event) { TreeNode node = event.getNode(); String path = node.getAttribute("id").replaceAll("_", "/"); - CoreGUI.goToView("Bundles/Bundle/" + path); + + // the node ID is the path the form <bundleGroupId>_<the rest of the node ID> + String[] splitPath = path.split("/", 2); + + try { + currentlySelectedBundleGroupId = Integer.parseInt(splitPath[0]); + } catch (NumberFormatException e) { + CoreGUI.getErrorHandler().handleError("Cannot determine the selected bundle group: " + path); + } + + if (splitPath.length == 1) { + CoreGUI.goToView("Bundles"); + } else { + CoreGUI.goToView("Bundles/Bundle/" + splitPath[1]); + } } }); }

1 0

[rhq] 3 commits - modules/common modules/core modules/enterprise
by snegrea 14 Aug '13

14 Aug '13

modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java | 8 + modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java | 3 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java | 4 modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/SchemaNotInstalledException.java | 38 +++++++ modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java | 48 ++++++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 2 6 files changed, 99 insertions(+), 4 deletions(-) New commits: commit 8a8727caabae944cc749a35a26a6b91abbad5729 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 14 15:44:07 2013 -0500 Fixing errors after rebase merge. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index aa6f78f..11d81b4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -153,7 +153,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private ResourceManagerLocal resourceManager; @EJB - private StorageClusterSettingsManagerBean storageClusterSettingsManager; + private StorageClusterSettingsManagerLocal storageClusterSettingsManager; @EJB private StorageNodeOperationsHandlerLocal storageNodeOperationsHandler; @@ -625,7 +625,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return configuration; } - + @Override @Asynchronous public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { commit 61fb79fad813bf75c5274743c4f161d37857b4e5 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 14 15:30:37 2013 -0500 More text for the schema compatibility text. diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java index ec54a0c..fe6ddf9 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java @@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.rhq.cassandra.schema.exception.InstalledSchemaTooAdvancedException; import org.rhq.cassandra.schema.exception.InstalledSchemaTooOldException; +import org.rhq.cassandra.schema.exception.SchemaNotInstalledException; import org.rhq.core.domain.cloud.StorageNode; /** @@ -258,6 +259,11 @@ class VersionManager extends AbstractManager { try { initClusterSession(); + if (!this.schemaExists()) { + log.error("Storage cluster schema not installed. Please re-run the server installer to install the storage cluster schema properly."); + throw new SchemaNotInstalledException(); + } + int installedSchemaVersion = this.getInstalledSchemaVersion(); UpdateFolder folder = new UpdateFolder(Task.Update.getFolder()); @@ -280,7 +286,7 @@ class VersionManager extends AbstractManager { } finally { shutdownClusterConnection(); - log.info("Completed check for storage schema compatibility."); + log.info("Completed storage schema compatibility check."); } } } diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java index 2f83ef5..bf36b25 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java @@ -33,6 +33,7 @@ public class InstalledSchemaTooAdvancedException extends Exception { public InstalledSchemaTooAdvancedException() { super( - "Storage schema is too advanced for the current installation. Schema revisions have been applied beyond the capability of the installation."); + "Storage schema is too advanced for the current installation. Schema revisions have been applied beyond the capability of the installation. " + + "Please install a newer version of the server that is compatibile with the storage schema version."); } } \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java index 4da863b..db4bfbf 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java @@ -29,10 +29,12 @@ package org.rhq.cassandra.schema.exception; /** * @author Stefan Negrea */ +@SuppressWarnings("serial") public class InstalledSchemaTooOldException extends Exception { public InstalledSchemaTooOldException() { super( - "Storage schema needs to be updated. The schema manager contains updates not yet applied to the storage cluster installation."); + "Storage schema is not properly updated. The schema manager contains updates not yet applied to the storage cluster installation." + + "Please re-run the server installer to update the current schema to the latest version."); } } \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/SchemaNotInstalledException.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/SchemaNotInstalledException.java new file mode 100644 index 0000000..63e9013 --- /dev/null +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/SchemaNotInstalledException.java @@ -0,0 +1,38 @@ +/* + * + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +package org.rhq.cassandra.schema.exception; + + +/** + * @author Stefan Negrea + */ +@SuppressWarnings("serial") +public class SchemaNotInstalledException extends Exception { + + public SchemaNotInstalledException() { + super("Storage schema is not properly installed. Please re-run the server installer to install storage schema."); + } +} \ No newline at end of file commit c50b47c2ba50ddc9640ec6060313e36aaa86b44f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Wed Aug 14 14:37:26 2013 -0500 [BZ 991598] Add basica node configuration validation to the composite class. It validates heap settings as well as port settings. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java index d7d7b7d..fccae9b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/StorageNodeConfigurationComposite.java @@ -115,6 +115,54 @@ public class StorageNodeConfigurationComposite implements Serializable { this.heapNewSize = heapNewSize; } + public boolean validate() { + //validate heap settings + boolean validHeap = false; + + String heapSize = getHeapSize() == null ? null : (getHeapSize().trim().length() == 0 ? null : getHeapSize() + .trim().toLowerCase()); + String heapNewSize = getHeapNewSize() == null ? null : (getHeapNewSize().trim().length() == 0 ? null + : getHeapNewSize().trim().toLowerCase()); + + if (heapSize == null && heapNewSize == null) { + validHeap = true; + } else if (heapSize != null && heapNewSize != null) { + try { + int heapSizeParsed = 0; + if (heapSize.contains("g")) { + heapSizeParsed = Integer.parseInt(heapSize.replace("g", "")) * 1024; + } else if (heapSize.contains("m")) { + heapSizeParsed = Integer.parseInt(heapSize.toLowerCase().replace("m", "")); + } else { + throw new IllegalArgumentException(); + } + + int heapNewSizeParsed = 0; + if (heapNewSize.contains("g")) { + heapNewSizeParsed = Integer.parseInt(heapNewSize.replace("g", "")) * 1024; + } else if (heapNewSize.contains("m")) { + heapNewSizeParsed = Integer.parseInt(heapNewSize.toLowerCase().replace("m", "")); + } else { + throw new IllegalArgumentException(); + } + + if (heapNewSizeParsed < heapSizeParsed) { + validHeap = true; + } + } catch (Exception e) { + //Nothing to do heap settings are not valid since parsing failed at some point + } + } + + //validate JMX Port + boolean validJMXPort = false; + if (this.getJmxPort() < 65535) { + validJMXPort = true; + } + + return validHeap && validJMXPort; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index d7085da..aa6f78f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -153,7 +153,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private ResourceManagerLocal resourceManager; @EJB - private StorageClusterSettingsManagerLocal storageClusterSettingsManager; + private StorageClusterSettingsManagerBean storageClusterSettingsManager; @EJB private StorageNodeOperationsHandlerLocal storageNodeOperationsHandler; @@ -575,7 +575,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) { - List<StorageNode> initialStorageNodes = null; + List<StorageNode> initialStorageNodes = getStorageNodes(); if (storageNode == null) { initialStorageNodes = getStorageNodes(); } else { @@ -625,7 +625,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return configuration; } - + @Override @Asynchronous public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) {

1 0

[rhq] modules/enterprise
by mike thompson 14 Aug '13

14 Aug '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/GraphMarker.java | 32 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java | 17 +++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java | 16 +++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java | 2 6 files changed, 57 insertions(+), 15 deletions(-) New commits: commit d4de10efdbd458ece2beaf9444c1a61b17f4ef00 Author: Mike Thompson <mithomps(a)redhat.com> Date: Wed Aug 14 10:32:20 2013 -0700 Add GraphMarker interface to mark places in the code where graphs are (later) injected by d3 javascript code. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/GraphMarker.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/GraphMarker.java new file mode 100644 index 0000000..da88999 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/GraphMarker.java @@ -0,0 +1,32 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client; + +/** + * Defines the first step in the 2 step approach to creating graphs. + * <ol> + * <li>Step 1: Create the graph marker in the page.</li> + * <li>Step 2: Create and Attach a graph to graph marker via HasD3MetricJsniChart.drawJsniChart</li> + * </ol> + * + * @author Mike Thompson + */ +public interface GraphMarker { + String createGraphMarker(); +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 59d4c75..eb20d40 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient; */ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { - private static Messages MSG = CoreGUI.getMessages(); + private static final Messages MSG = CoreGUI.getMessages(); private List<Availability> availabilityList; private List<ResourceGroupAvailability> groupAvailabilityList; private Integer entityId; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java index 72438fd6..2099bfc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilitySummaryPieGraphType.java @@ -23,6 +23,7 @@ import java.util.List; import com.smartgwt.client.widgets.HTMLFlow; +import org.rhq.enterprise.gui.coregui.client.GraphMarker; import org.rhq.enterprise.gui.coregui.client.util.Log; /** @@ -32,7 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; * * @author Mike Thompson */ -public class AvailabilitySummaryPieGraphType { +public class AvailabilitySummaryPieGraphType implements GraphMarker{ public static final int HEIGHT = 75; public static final int WIDTH = 75; @@ -42,7 +43,14 @@ public class AvailabilitySummaryPieGraphType { public AvailabilitySummaryPieGraphType() { } - public HTMLFlow createGraphMarker() { + public HTMLFlow addGraphMarkerMember(){ + HTMLFlow graphFlow = new HTMLFlow(createGraphMarker()); + graphFlow.setWidth(WIDTH); + graphFlow.setHeight(HEIGHT); + return graphFlow; + + } + public String createGraphMarker() { Log.debug("drawGraph marker in AvailabilitySummaryPieGraph"); StringBuilder divAndSvgDefs = new StringBuilder(); @@ -50,10 +58,7 @@ public class AvailabilitySummaryPieGraphType { divAndSvgDefs.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:" + HEIGHT + "px;\" ></svg>"); divAndSvgDefs.append("</div>"); - HTMLFlow graphFlow = new HTMLFlow(divAndSvgDefs.toString()); - graphFlow.setWidth(WIDTH); - graphFlow.setHeight(HEIGHT); - return graphFlow; + return divAndSvgDefs.toString(); } public void setAvailabilityData(String upLabel, double upPercent, String downLabel, double downPercent, diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java index 4dad9b1..20eb39b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitori import com.google.gwt.user.client.Timer; import com.smartgwt.client.widgets.HTMLFlow; +import org.rhq.enterprise.gui.coregui.client.GraphMarker; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractD3GraphListView; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.Refreshable; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.graphtype.StackedBarMetricGraphImpl; @@ -31,7 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * A D3 graph implementation for graphing Resource metrics. * Just the graph only. No avail graph no buttons just he graph. */ -public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout implements Refreshable { +public class MetricD3Graph<T extends AbstractD3GraphListView> extends EnhancedVLayout implements Refreshable,GraphMarker { protected StackedBarMetricGraphImpl graph; private HTMLFlow graphDiv = null; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java index 6e3b590..2c3a4c7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java @@ -24,6 +24,7 @@ import com.smartgwt.client.widgets.HTMLFlow; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability; +import org.rhq.enterprise.gui.coregui.client.GraphMarker; import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.AvailabilityGraphType; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; @@ -34,7 +35,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; * * @author Mike Thompson */ -public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends EnhancedVLayout { +public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends EnhancedVLayout implements GraphMarker { protected T availabilityGraphType; @@ -49,14 +50,14 @@ public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends En protected void onDraw() { super.onDraw(); removeMembers(getMembers()); - createGraphMarker(); + addGraphMarkerComponent(); } @Override public void parentResized() { super.parentResized(); removeMembers(getMembers()); - createGraphMarker(); + addGraphMarkerComponent(); drawJsniChart(); } @@ -76,7 +77,7 @@ public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends En * */ - public void createGraphMarker() { + public String createGraphMarker() { Log.debug("drawGraph marker in AvailabilityD3Graph for: " + availabilityGraphType.getChartId()); StringBuilder divAndSvgDefs = new StringBuilder(); @@ -99,11 +100,14 @@ public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends En divAndSvgDefs.append("</div>"); divAndSvgDefs.append("</div>"); // end availTooltipDiv divAndSvgDefs.append("</div>"); - HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); + return divAndSvgDefs.toString(); + } + + public void addGraphMarkerComponent(){ + HTMLFlow graph = new HTMLFlow(createGraphMarker()); graph.setWidth100(); graph.setHeight(65); addMember(graph); - } /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java index 5835f61..a058e4f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/ResourceMetricAvailabilityView.java @@ -140,7 +140,7 @@ public class ResourceMetricAvailabilityView extends EnhancedVLayout { CanvasItem availPieChartItem = new CanvasItem(); availPieChartItem.setTitle(MSG.pie_chart_availability_summary_label()); - availPieChartItem.setCanvas(availabilitySummaryPieGraph.createGraphMarker()); + availPieChartItem.setCanvas(availabilitySummaryPieGraph.addGraphMarkerMember()); availPieChartItem.setRowSpan(3); availPieChartItem.setVAlign(VerticalAlignment.TOP); availPieChartItem.setTitleVAlign(VerticalAlignment.TOP);

1 0

[rhq] Branch 'nightly/rhq.jon' - 35 commits - modules/core modules/enterprise modules/plugins
by Simeon Pinder 14 Aug '13

14 Aug '13

modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java | 22 +- modules/core/client-api/src/main/resources/rhq-configuration.xsd | 18 ++ modules/core/dbutils/pom.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml | 1 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 6 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyOptionsSource.java | 69 ++++++-- modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 18 -- modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceUtility.java | 32 +++ modules/core/domain/src/test/java/org/rhq/core/domain/util/ResourceUtilityTest.java | 84 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java | 18 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java | 42 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDetailView.java | 55 +++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 23 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 25 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java | 9 + modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 83 ++++++--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 8 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 76 ++++----- modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 8 28 files changed, 497 insertions(+), 158 deletions(-) New commits: commit 986f4f49243702f9e21bc223e651a4a040bfcb13 Merge: 714fb04 0ac6f0c Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Wed Aug 14 13:32:53 2013 -0400 Merging master into nightly/rhq.jon. diff --cc modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index e925de2,d7085da..5f961a6 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@@ -625,14 -625,14 +625,20 @@@ public class StorageNodeManagerBean imp return configuration; } + + @Override + @Asynchronous + public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + updateConfiguration(subject, storageNodeConfiguration); + } @Override + @Asynchronous + public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + updateConfiguration(subject, storageNodeConfiguration); + } + + @Override public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { try { StorageNode storageNode = findStorageNodeByAddress(InetAddress.getByName( commit 0ac6f0c384a9c10c6da88c05fb60de67a6478482 Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Mon Apr 15 17:07:28 2013 +0200 [BZ 865460] Cannot add a Group to tomcat's UserDatabase diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java index 0a95069..ead4956 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java @@ -51,6 +51,7 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe if (TomcatGroupComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) { name = report.getResourceConfiguration().getSimple("groupname").getStringValue(); newRoles = report.getResourceConfiguration().getSimple(TomcatGroupComponent.CONFIG_ROLES); + report.getResourceConfiguration().remove(TomcatGroupComponent.CONFIG_ROLES); objectName = String.format("Users:type=Group,groupname=\"%s\",database=UserDatabase", name); operation = "createGroup"; } else if (TomcatRoleComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) { commit f625bff9b253beb4f4810109b5f4f964b5a73f1e Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Mon Apr 15 16:28:19 2013 +0200 [BZ 921194] Additional corrections by lfuka. diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml index 653736f..2fd8931 100644 --- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml @@ -734,7 +734,9 @@ <c:simple-property name="name" type="string" - readOnly="true" /> + readOnly="true" + default="Default Tomcat Connector name" + description="Connector name."/> <c:simple-property name="port" type="string" @@ -748,8 +750,8 @@ <c:simple-property name="connector" type="string" - description="Connector protocol connector. Note: Only available on Tomcat 7." - required="false" + description="Connector protocol connector." + default="Default connector" readOnly="true" /> <c:simple-property name="address" commit f04c9ef98291ed1cfe44d4c752dba7234f03672b Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Wed Apr 10 15:26:38 2013 +0200 [BZ 921261] WebModule is reported as DOWN or UNAVAILABLE ... from da0179ab26a0c3e3a50238e9997147864e5a759b diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml index 97f410a..653736f 100644 --- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml @@ -748,7 +748,8 @@ <c:simple-property name="connector" type="string" - description="Connector protocol connector." + description="Connector protocol connector. Note: Only available on Tomcat 7." + required="false" readOnly="true" /> <c:simple-property name="address" commit a978c9b911b4198f2a5d06477a11fb4811a1fb46 Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Wed Apr 10 15:22:52 2013 +0200 [BZ 921261] WebModule is reported as DOWN or UNAVAILABLE ... from 00e594847fe67da46f8976df58b5d2324d6ebb48 diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java index 2a39e25..0a51c45 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java @@ -370,7 +370,23 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon mbeanOperation.invoke(paramValues); if (!WarOperation.DESTROY.equals(operation)) { - String state = (String) this.webModuleMBean.getAttribute("stateName").refresh(); + String state = null; + try { + // check to see if the mbean is truly active + state = (String) this.webModuleMBean.getAttribute("stateName").refresh(); + } catch (Exception e) { + // if not active an exception may be thrown + state = WarMBeanState.STOPPED; + // try "state" for Tomcat 5.5 + try { + int stateInt = (Integer) this.webModuleMBean.getAttribute("state").refresh(); + if (stateInt == 1) { + state = WarMBeanState.STARTED; + } + } catch (Exception ex) { + // Ignore + } + } String expectedState = getExpectedPostExecutionState(operation); if (!state.equals(expectedState)) { throw new Exception("Failed to " + name + " webapp (value of the 'state' attribute of MBean '" commit 0aec2ecc35daaaef6d845cd72eb53b377a7deeef Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Wed Apr 10 15:17:22 2013 +0200 [BZ 921194] Connectors are not properly discovered and therefore are unavailable.. from 00e594847fe67da46f8976df58b5d2324d6ebb48. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java index 7a65a73..32566d5 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java @@ -132,12 +132,14 @@ public class TomcatConnectorDiscoveryComponent extends MBeanResourceDiscoveryCom if (connectorON != null) { EmsBean connectorBean = connection.getBean(connectorON); EmsAttribute executorNameAttrib = connectorBean.getAttribute("executorName"); - Object executorNameValue = executorNameAttrib.getValue(); - if (executorNameValue != null) { - String executorName = executorNameValue.toString(); - if (!executorName.isEmpty() && !executorName.equalsIgnoreCase("Internal")) { - pluginConfiguration.put(new PropertySimple( - TomcatConnectorComponent.PLUGIN_CONFIG_SHARED_EXECUTOR, executorName)); + if (executorNameAttrib != null) { + Object executorNameValue = executorNameAttrib.getValue(); + if (executorNameValue != null) { + String executorName = executorNameValue.toString(); + if (!executorName.isEmpty() && !executorName.equalsIgnoreCase("Internal")) { + pluginConfiguration.put(new PropertySimple( + TomcatConnectorComponent.PLUGIN_CONFIG_SHARED_EXECUTOR, executorName)); + } } } } commit 07dd8cdca9c98093bd1586bd772b866cac286ea1 Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Wed Apr 10 15:13:02 2013 +0200 Fix BZ 865460 from 417fbb59817edf64a93d3cca00f2c51926379ab2 Conflicts: modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java index ead4956..0a95069 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java @@ -51,7 +51,6 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe if (TomcatGroupComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) { name = report.getResourceConfiguration().getSimple("groupname").getStringValue(); newRoles = report.getResourceConfiguration().getSimple(TomcatGroupComponent.CONFIG_ROLES); - report.getResourceConfiguration().remove(TomcatGroupComponent.CONFIG_ROLES); objectName = String.format("Users:type=Group,groupname=\"%s\",database=UserDatabase", name); operation = "createGroup"; } else if (TomcatRoleComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) { commit 4db84715b9e8597d600d9811710e734f4b10cc16 Author: jfclere <jfclere(a)neo2.gva.redhat.com> Date: Wed Apr 10 14:33:38 2013 +0200 fix for BZ: 707349 from e7d48240474fba87f1a3c4118de4618fd2c8b32d. Conflicts: modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java index 32566d5..7a65a73 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java @@ -132,14 +132,12 @@ public class TomcatConnectorDiscoveryComponent extends MBeanResourceDiscoveryCom if (connectorON != null) { EmsBean connectorBean = connection.getBean(connectorON); EmsAttribute executorNameAttrib = connectorBean.getAttribute("executorName"); - if (executorNameAttrib != null) { - Object executorNameValue = executorNameAttrib.getValue(); - if (executorNameValue != null) { - String executorName = executorNameValue.toString(); - if (!executorName.isEmpty() && !executorName.equalsIgnoreCase("Internal")) { - pluginConfiguration.put(new PropertySimple( - TomcatConnectorComponent.PLUGIN_CONFIG_SHARED_EXECUTOR, executorName)); - } + Object executorNameValue = executorNameAttrib.getValue(); + if (executorNameValue != null) { + String executorName = executorNameValue.toString(); + if (!executorName.isEmpty() && !executorName.equalsIgnoreCase("Internal")) { + pluginConfiguration.put(new PropertySimple( + TomcatConnectorComponent.PLUGIN_CONFIG_SHARED_EXECUTOR, executorName)); } } } diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java index 0a51c45..2a39e25 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java @@ -370,23 +370,7 @@ public class TomcatWarComponent extends MBeanResourceComponent<TomcatVHostCompon mbeanOperation.invoke(paramValues); if (!WarOperation.DESTROY.equals(operation)) { - String state = null; - try { - // check to see if the mbean is truly active - state = (String) this.webModuleMBean.getAttribute("stateName").refresh(); - } catch (Exception e) { - // if not active an exception may be thrown - state = WarMBeanState.STOPPED; - // try "state" for Tomcat 5.5 - try { - int stateInt = (Integer) this.webModuleMBean.getAttribute("state").refresh(); - if (stateInt == 1) { - state = WarMBeanState.STARTED; - } - } catch (Exception ex) { - // Ignore - } - } + String state = (String) this.webModuleMBean.getAttribute("stateName").refresh(); String expectedState = getExpectedPostExecutionState(operation); if (!state.equals(expectedState)) { throw new Exception("Failed to " + name + " webapp (value of the 'state' attribute of MBean '" diff --git a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml index 653736f..97f410a 100644 --- a/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml @@ -748,8 +748,7 @@ <c:simple-property name="connector" type="string" - description="Connector protocol connector. Note: Only available on Tomcat 7." - required="false" + description="Connector protocol connector." readOnly="true" /> <c:simple-property name="address" commit 5dbaed3e13f7ab06153aec5999c7eb4f1bc0f0b3 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Aug 14 19:19:52 2013 +0200 Alert view for a single storage node and its child resources. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java index cd0ec54..c99cf70c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java @@ -218,16 +218,18 @@ public class StorageNodeAdminView extends EnhancedVLayout implements/* HasViewNa } }.run(); } - -// @Override -// public ViewName getViewName() { -// return VIEW_ID; -// } public static String getAlertsString(String prefix, int numOfUnackAlerts) { - return prefix - + (numOfUnackAlerts != 0 ? " <font color='#CC0000;'>(" + numOfUnackAlerts + ")</font>" : " (" + return getAlertsString(prefix, -1, numOfUnackAlerts); + } + + public static String getAlertsString(String prefix, int storageNodeId, int numOfUnackAlerts) { + String detailsUrl = "#" + VIEW_PATH + "/" + storageNodeId + "/Alerts"; + detailsUrl = StringUtility.escapeHtml(detailsUrl); + String value = prefix + + (numOfUnackAlerts != 0 ? " <span style='color: #CC0000;'>(" + numOfUnackAlerts + ")</span>" : " (" + numOfUnackAlerts + ")"); + return storageNodeId == -1 ? value : LinkManager.getHref(detailsUrl, value); } private static final class TabInfo { @@ -274,7 +276,7 @@ public class StorageNodeAdminView extends EnhancedVLayout implements/* HasViewNa showTab(alertsTabInfo); } else if (backupTabInfo.name.getName().equals(viewId)) { showTab(backupTabInfo); - } else { + } else { //default showTab(tableTabInfo); table.renderView(viewPath); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java index 0821585..9fa55a6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java @@ -20,9 +20,11 @@ package org.rhq.enterprise.gui.coregui.client.admin.storage; import java.util.ArrayList; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Record; import com.smartgwt.client.types.GroupStartOpen; import com.smartgwt.client.types.ImageStyle; +import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGrid; @@ -30,7 +32,10 @@ import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.grid.SummaryFunction; +import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.core.domain.criteria.StorageNodeCriteria; +import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; @@ -38,6 +43,7 @@ import org.rhq.enterprise.gui.coregui.client.alert.AlertDataSource; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; @@ -47,9 +53,45 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; */ public class StorageNodeAlertHistoryView extends AlertHistoryView { private boolean isGouped = true; + private final HTMLFlow header; + private final int storageNodeId; public StorageNodeAlertHistoryView(String tableTitle, int[] resourceIds) { + this(tableTitle, resourceIds, null, -1); + } + + public StorageNodeAlertHistoryView(String tableTitle, int[] resourceIds, HTMLFlow header, int storageNodeId) { super(tableTitle, resourceIds); + this.header = header; + this.storageNodeId = storageNodeId; + } + + @Override + protected void onInit() { + super.onInit(); + if (header != null && storageNodeId != -1) { + StorageNodeCriteria criteria = new StorageNodeCriteria(); + criteria.addFilterId(storageNodeId); + GWTServiceLookup.getStorageService().findStorageNodesByCriteria(criteria, + new AsyncCallback<PageList<StorageNode>>() { + public void onSuccess(final PageList<StorageNode> storageNodes) { + if (storageNodes == null || storageNodes.isEmpty() || storageNodes.size() != 1) { + CoreGUI.getErrorHandler().handleError( + MSG.view_adminTopology_message_fetchServerFail(String.valueOf(storageNodeId))); + } + final StorageNode node = storageNodes.get(0); + header + .setContents("<div style='text-align: center; font-weight: bold; font-size: medium;'> Storage Node (" + + node.getAddress() + ")</div>"); + } + + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_adminTopology_message_fetchServerFail(String.valueOf(storageNodeId)) + " " + + caught.getMessage(), caught); + } + }); + } } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java index 7a777b1..e085eb1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDatasource.java @@ -215,8 +215,8 @@ public class StorageNodeDatasource extends RPCDataSource<StorageNodeLoadComposit } } int value = from.getUnackAlerts(); - record.setAttribute(FIELD_ALERTS.propertyName(), "New Alerts" - + (value != 0 ? " <span style='color: #CC0000;'>(" + value + ")</span>" : " (" + value + ")")); + record.setAttribute(FIELD_ALERTS.propertyName(), + StorageNodeAdminView.getAlertsString("New Alerts", node.getId(), value)); String memory = null; if (from.getHeapPercentageUsed() != null && from.getHeapPercentageUsed().getAggregate().getAvg() != null) memory = MeasurementConverterClient.format(from.getHeapPercentageUsed().getAggregate().getAvg(), from diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDetailView.java index a5ae6eb..dc500f0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeDetailView.java @@ -36,6 +36,7 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VisibilityMode; +import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.FormItem; @@ -51,6 +52,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowCo import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.core.domain.util.PageList; +import org.rhq.core.domain.util.collection.ArrayUtils; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; @@ -63,6 +65,7 @@ import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedUtility; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -85,6 +88,7 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab private SectionStackSection detailsAndLoadSection; private StaticTextItem alertsItem; private HTMLFlow header; + private boolean alerts = false; private volatile int initSectionCount = 0; private int unackAlerts = -1; @@ -107,6 +111,9 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab @Override protected void onInit() { super.onInit(); + if (alerts) { + return; + } StorageNodeCriteria criteria = new StorageNodeCriteria(); criteria.addFilterId(storageNodeId); criteria.fetchResource(true); @@ -189,7 +196,7 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab } else { unackAlerts = result.get(0); if (alertsItem != null) { - alertsItem.setValue(StorageNodeAdminView.getAlertsString("New Alerts", unackAlerts)); + alertsItem.setValue(StorageNodeAdminView.getAlertsString("New Alerts", storageNodeId, unackAlerts)); } } } @@ -203,6 +210,9 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab @Override protected void onDraw() { super.onDraw(); + if (alerts) { + return; + } // wait until we have all of the sections before we show them. We don't use InitializableView because, // it seems they are not supported (in the applicable renderView()) at this level. @@ -284,8 +294,9 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab TimestampCellFormatter.DATE_TIME_FORMAT_LONG)); alertsItem = new StaticTextItem(FIELD_ALERTS.propertyName(), FIELD_ALERTS.title()); + alertsItem.setPrompt("The number in brackets represents the number of unacknowledged alerts for this storage node."); if (unackAlerts != -1) { - alertsItem.setValue(StorageNodeAdminView.getAlertsString("New Alerts", unackAlerts)); + alertsItem.setValue(StorageNodeAdminView.getAlertsString("New Alerts", storageNodeId, unackAlerts)); } StaticTextItem memoryStatusItem = new StaticTextItem("memoryStatus", "Memory"); @@ -341,9 +352,9 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab } private void prepareResourceConfigEditor(final StorageNodeConfigurationComposite configuration) { - LayoutSpacer spacer = new LayoutSpacer(); - spacer.setHeight(15); - StorageNodeConfigurationEditor editorView = new StorageNodeConfigurationEditor(configuration); + LayoutSpacer spacer = new LayoutSpacer(); + spacer.setHeight(15); + StorageNodeConfigurationEditor editorView = new StorageNodeConfigurationEditor(configuration); SectionStackSection section = new SectionStackSection("Configuration"); section.setItems(spacer, editorView); section.setExpanded(true); @@ -353,10 +364,40 @@ public class StorageNodeDetailView extends EnhancedVLayout implements Bookmarkab initSectionCount++; } + private void showAlertsForSingleStorageNode() { + GWTServiceLookup.getStorageService().findResourcesWithAlertDefinitions(new StorageNode(storageNodeId), + new AsyncCallback<Integer[]>() { + @Override + public void onFailure(Throwable caught) { + alerts = false; + Message message = new Message("foobar", Message.Severity.Warning); +// CoreGUI.goToView(VIEW_ID.getName(), message); + } + + @Override + public void onSuccess(Integer[] result) { + if (result == null || result.length == 0) { + onFailure(new Exception("foobaz")); + } else { + removeMember(sectionStack); + sectionStack.destroy(); + int[] resIds = ArrayUtils.unwrapArray(result); + Canvas alertsView = new StorageNodeAlertHistoryView("storageNode_" + storageNodeId + "_Alerts", + resIds, header, storageNodeId); + addMember(alertsView); + } + } + }); + } + @Override public void renderView(ViewPath viewPath) { -// if (viewPath.toString().endsWith("/Config")) { -// } + if (viewPath.toString().endsWith("/Alerts")) { + alerts = true; + showAlertsForSingleStorageNode(); + } else { + alerts = false; + } Log.debug("StorageNodeDetailView: " + viewPath); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java index bd415b2..efe56e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeTableView.java @@ -83,7 +83,7 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { @Override protected void doOnDraw() { super.doOnDraw(); - scheduleUnacknowledgedAlertsPollingJob(getListGrid()); +// scheduleUnacknowledgedAlertsPollingJob(getListGrid()); } @Override @@ -153,8 +153,9 @@ public class StorageNodeTableView extends TableSection<StorageNodeDatasource> { public void onSuccess(List<Integer> result) { for (int i = 0; i < records.length; i++) { int value = result.get(i); + int storageNodeId = records[i].getAttributeAsInt("id"); records[i].setAttribute(FIELD_ALERTS.propertyName(), - StorageNodeAdminView.getAlertsString("New Alerts", value)); + StorageNodeAdminView.getAlertsString("New Alerts", storageNodeId, value)); listGrid.setData(records); } schedule(15 * 1000); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java index 957bf34..38829a5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java @@ -76,6 +76,8 @@ public interface StorageGWTService extends RemoteService { Integer[] findResourcesWithAlertDefinitions() throws RuntimeException; + Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) throws RuntimeException; + int findNotAcknowledgedStorageNodeAlertsCount() throws RuntimeException; List<Integer> findNotAcknowledgedStorageNodeAlertsCounts(List<Integer> storageNodeIds) throws RuntimeException; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java index f7f7442..b7437e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java @@ -116,6 +116,15 @@ public class StorageGWTServiceImpl extends AbstractGWTServiceImpl implements Sto } @Override + public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) throws RuntimeException { + try { + return storageNodeManager.findResourcesWithAlertDefinitions(storageNode); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + + @Override public int findNotAcknowledgedStorageNodeAlertsCount() throws RuntimeException { try { return storageNodeManager.findNotAcknowledgedStorageNodeAlerts(getSessionSubject()).size(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index e925de2..d7085da 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -575,7 +575,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN @Override public Integer[] findResourcesWithAlertDefinitions(StorageNode storageNode) { - List<StorageNode> initialStorageNodes = getStorageNodes(); + List<StorageNode> initialStorageNodes = null; if (storageNode == null) { initialStorageNodes = getStorageNodes(); } else { @@ -625,7 +625,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return configuration; } - + @Override @Asynchronous public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { commit 1e826c93f260fb53f8befc5ab9a3b9a74dfbee75 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Aug 14 11:20:02 2013 -0400 remove entries for stuff still in a branch diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 5182ef1..617593a 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -67,7 +67,7 @@ <difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType>  - <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.bundle.BundleGroup)</method> + <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, java.lang.String, java.lang.String)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> @@ -162,11 +162,4 @@ <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> - <difference> - <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> - <differenceType>7012</differenceType>  - <method>org.rhq.core.domain.bundle.BundleGroup updateBundleGroup(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.bundle.BundleGroup)</method> - <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> - </difference> - </differences> commit 07bead42ccd636be67b717e9922f5a4eb134cff8 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Aug 14 11:13:09 2013 +0200 Bug 956329 - Create new Managed Server using EAP 6 plug-in exposes server groups and socket binding groups from other resources Introduced new expressionScope attribute in RHQ config XSD for option source node (updated config parser, PropertyOptionSource entity and database schema accordingly) Updated ConfigurationGWTService and ConfigurationManagerBean: now when filling enumeratedValues we look at expressionScope attribute to narrow down search results if expressionScope is 'baseResource' Updated as7 plugin to use new expressionScope attribute for Managed Server resource configuration attributes diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java index 4fa4558e..35ef00a 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java @@ -1,24 +1,20 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.core.clientapi.agent.metadata; @@ -40,6 +36,7 @@ import org.rhq.core.clientapi.descriptor.configuration.ConfigurationProperty; import org.rhq.core.clientapi.descriptor.configuration.ConfigurationTemplateDescriptor; import org.rhq.core.clientapi.descriptor.configuration.ConstraintType; import org.rhq.core.clientapi.descriptor.configuration.DynamicProperty; +import org.rhq.core.clientapi.descriptor.configuration.ExpressionScope; import org.rhq.core.clientapi.descriptor.configuration.FloatConstraintType; import org.rhq.core.clientapi.descriptor.configuration.IntegerConstraintType; import org.rhq.core.clientapi.descriptor.configuration.ListProperty; @@ -256,6 +253,11 @@ public class ConfigurationMetadataParser { throw new IllegalArgumentException("Filter expression must be less than 40 chars long"); } optionsSource.setFilter(source.getFilter()); + ExpressionScope expressionScope = source.getExpressionScope(); + if (expressionScope != null) { + optionsSource.setExpressionScope(PropertyOptionsSource.ExpressionScope.fromValue(expressionScope + .value())); + } String expression = source.getExpression(); if (expression == null || expression.isEmpty()) throw new IllegalArgumentException("Expression must not be empty"); diff --git a/modules/core/client-api/src/main/resources/rhq-configuration.xsd b/modules/core/client-api/src/main/resources/rhq-configuration.xsd index 4b706d8..d5e186b 100644 --- a/modules/core/client-api/src/main/resources/rhq-configuration.xsd +++ b/modules/core/client-api/src/main/resources/rhq-configuration.xsd @@ -479,7 +479,11 @@ Expressions are written in the syntax of the search bar.</xs:documentation> </xs:annotation> </xs:attribute> - + <xs:attribute name="expressionScope" use="optional" default="unlimited" type="config:expressionScope"> + <xs:annotation> + <xs:documentation>A scope for expression searches. Default value is 'unlimited'.</xs:documentation> + </xs:annotation> + </xs:attribute> </xs:complexType> <xs:complexType name="option"> @@ -607,4 +611,16 @@ </xs:restriction> </xs:simpleType> + <xs:simpleType name="expressionScope"> + <xs:annotation> + <xs:documentation>A scope for expression searches. Must be one of 'unlimited' or 'baseResource'. + 'unlimited' means that search results may include any resource in inventory. 'baseResource' narrows down to the + top level server or service.</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="unlimited"/> + <xs:enumeration value="baseResource"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index a3c82c2..2e8e4b8 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -17,7 +17,7 @@ <description>Database schema setup, upgrade and other utilities</description> <properties> - <db.schema.version>2.135</db.schema.version> + <db.schema.version>2.136</db.schema.version> <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name> <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml index d5d937e..1328915 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml @@ -65,6 +65,7 @@ <column name="LINK_TO_TARGET" type="BOOLEAN" required="false"/> <column name="FILTER" type="VARCHAR2" required="false" size="40"/> <column name="EXPRESSION" type="VARCHAR2" required="true" size="400"/> + <column name="EXPRESSION_SCOPE" type="VARCHAR2" required="true" size="12" default="unlimited"/> <column name="TARGET_TYPE" type="VARCHAR2" required="true" size="20"/> <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/> </table> diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 341f0b2..6f42345 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -1,4 +1,3 @@ - <project name="db-upgrade" default="upgrade" basedir=".">  <c:simple-property name="hostname" displayName="Name of the host to put the server on" required="true" readOnly="true"> - <c:option-source target="resource" expression="type=^Host$ plugin=&pluginName;"/> + <c:option-source target="resource" expression="type=^Host$ plugin=&pluginName;" expressionScope="baseResource"/> </c:simple-property> <c:simple-property name="group" readOnly="false" displayName="Server Group" description="Server Group this instance belongs to."> - <c:option-source target="resource" expression="type=ServerGroup"/> + <c:option-source target="resource" expression="type=ServerGroup" expressionScope="baseResource"/> </c:simple-property> - <c:simple-property name="socket-binding-group" readOnly="false" displayName="Socket binding group" description="Socket bindings to use" required="true" default="standard-sockets"> - <c:option-source target="resource" expression="type=SocketBindingGroup"/> + <c:simple-property name="socket-binding-group" readOnly="false" displayName="Socket binding group" description="Socket bindings to use" required="true"> + <c:option-source target="resource" expression="type=SocketBindingGroup" expressionScope="baseResource"/> </c:simple-property> <c:simple-property name="socket-binding-port-offset" readOnly="false" displayName="Port Offset" type="integer" default="0" description="Offset to the base ports"/> <c:simple-property name="auto-start" displayName="Autostart" default="false" type="boolean"/> commit 2a21d7b3a9a97248df2ab6d9d83804663c55972b Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Wed Aug 14 16:51:00 2013 +0200 Bug 846362 - [jboss-as5] Shutdown max wait time "shared" between different resources diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java index b96a2cc..2ced390 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java @@ -1,27 +1,28 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package org.rhq.plugins.jbossas5; +import static java.util.concurrent.TimeUnit.MINUTES; +import static org.rhq.core.util.StringUtil.isBlank; +import static org.rhq.plugins.jbossas5.ApplicationServerPluginConfigurationProperties.START_WAIT_MAX_PROP; +import static org.rhq.plugins.jbossas5.ApplicationServerPluginConfigurationProperties.STOP_WAIT_MAX_PROP; + import java.io.File; import java.util.List; import java.util.Map; @@ -54,7 +55,7 @@ import org.rhq.core.system.SystemInfo; * @author Jay Shaughnessy */ public class ApplicationServerOperationsDelegate { - + private static class ExecutionFailedException extends Exception { private static final long serialVersionUID = 1L; @@ -76,12 +77,12 @@ public class ApplicationServerOperationsDelegate { super(cause); } } - + /** - * max amount of time to wait for server to show as unavailable after + * default max amount of time to wait for server to show as unavailable after * executing stop - in milliseconds */ - private static long STOP_WAIT_MAX = 1000L * 150; // 2.5 minutes + private static final long DEFAULT_STOP_WAIT_MAX = 1000L * 150; // 2.5 minutes /** * amount of time to wait between availability checks when performing a stop @@ -95,8 +96,8 @@ public class ApplicationServerOperationsDelegate { */ private static final long STOP_WAIT_FINAL = 1000L * 30; // 30 seconds - /** max amount of time to wait for start to complete - in milliseconds */ - private static long START_WAIT_MAX = 1000L * 300; // 5 minutes + /** default max amount of time to wait for start to complete - in milliseconds */ + private static final long DEFAULT_START_WAIT_MAX = 1000L * 300; // 5 minutes /** * amount of time to wait between availability checks when performing a @@ -503,17 +504,9 @@ public class ApplicationServerOperationsDelegate { AvailabilityType avail; //detect whether startWaitMax property has been set. Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); - PropertySimple property = pluginConfig - .getSimple(ApplicationServerPluginConfigurationProperties.START_WAIT_MAX_PROP); - //if set and valid, update startWaitMax value - if ((property != null) && (property.getIntegerValue() != null)) { - int newValue = property.getIntegerValue(); - if (newValue >= 1) { - START_WAIT_MAX = 1000L * 60 * newValue; - } - } + long startWaitMax = getMaxWait(pluginConfig.getSimple(START_WAIT_MAX_PROP), DEFAULT_START_WAIT_MAX); while (((avail = this.serverComponent.getAvailability()) == AvailabilityType.DOWN) - && (System.currentTimeMillis() < (start + START_WAIT_MAX))) { + && (System.currentTimeMillis() < (start + startWaitMax))) { try { Thread.sleep(START_WAIT_INTERVAL); } catch (InterruptedException e) { @@ -528,17 +521,9 @@ public class ApplicationServerOperationsDelegate { AvailabilityType avail; //detect whether stopWaitMax property has been set. Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); - PropertySimple property = pluginConfig - .getSimple(ApplicationServerPluginConfigurationProperties.STOP_WAIT_MAX_PROP); - //if set and valid update stopWaitMax value - if ((property != null) && (property.getIntegerValue() != null)) { - int newValue = property.getIntegerValue(); - if (newValue >= 1) { - STOP_WAIT_MAX = 1000L * 60 * newValue; - } - } + long stopWaitMax = getMaxWait(pluginConfig.getSimple(STOP_WAIT_MAX_PROP), DEFAULT_STOP_WAIT_MAX); while (((avail = this.serverComponent.getAvailability()) == AvailabilityType.UP) - && (System.currentTimeMillis() < (start + STOP_WAIT_MAX))) { + && (System.currentTimeMillis() < (start + stopWaitMax))) { try { Thread.sleep(STOP_WAIT_INTERVAL); } catch (InterruptedException e) { @@ -556,6 +541,22 @@ public class ApplicationServerOperationsDelegate { return avail; } + private long getMaxWait(PropertySimple propertySimple, long defaultValueInMillis) { + if (propertySimple == null || isBlank(propertySimple.getStringValue())) { + return defaultValueInMillis; + } + try { + long valueInMinutes = Long.parseLong(propertySimple.getStringValue()); + if (valueInMinutes > 0) { + return MINUTES.toMillis(valueInMinutes); + } else { + return defaultValueInMillis; + } + } catch (NumberFormatException e) { + return defaultValueInMillis; + } + } + /** * Return the absolute path of this JBoss server's start script (e.g. * "C:\opt\jboss-5.1.0.GA\bin\run.sh"). @@ -659,4 +660,3 @@ public class ApplicationServerOperationsDelegate { } } } - commit 125bc23aba00ebc793f51d146268c9a90f43cda8 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Aug 13 23:56:39 2013 -0400 adding test impl of StorageClusterSettingsManagerLocal diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStorageClusterSettingsManagerBean.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStorageClusterSettingsManagerBean.java new file mode 100644 index 0000000..3ac61e4 --- /dev/null +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStorageClusterSettingsManagerBean.java @@ -0,0 +1,26 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Stateless; + +import org.rhq.core.domain.auth.Subject; + +/** + * @author John Sanda + */ +@Stateless +public class FakeStorageClusterSettingsManagerBean implements StorageClusterSettingsManagerLocal { + + @Override + public StorageClusterSettings getClusterSettings(Subject subject) { + StorageClusterSettings settings = new StorageClusterSettings(); + settings.setGossipPort(7100); + settings.setCqlPort(9042); + + return settings; + } + + @Override + public void setClusterSettings(Subject subject, StorageClusterSettings clusterSettings) { + //To change body of implemented methods use File | Settings | File Templates. + } +} commit 2da51f406a79a5ff6ba1251755d610364df1f119 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Aug 13 23:06:17 2013 -0400 attempting to fix server itest failures I am not sure why but DiscoveryBossBeanTest has been failing due to calls to StorageClusterSettingsManagerBean made by StorageNodeManagerBean. I am deploying a test impl for StorageClusterSettingsManager to see if it resovles the issues. There is no need to deploy the production EJB. It is just a thin wrapper around SystemManagerBean, and it can/should be tested separately. diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java index 44a4646..0f1c6fb 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java @@ -88,6 +88,7 @@ import org.rhq.enterprise.server.plugin.pc.ServerPluginService; import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceMBean; import org.rhq.enterprise.server.scheduler.SchedulerService; import org.rhq.enterprise.server.scheduler.SchedulerServiceMBean; +import org.rhq.enterprise.server.storage.FakeStorageClusterSettingsManagerBean; import org.rhq.enterprise.server.storage.StorageClientManagerBean; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.test.AssertUtils; @@ -352,6 +353,8 @@ public abstract class AbstractEJB3Test extends Arquillian { .create("/rhq-server.jar/org/rhq/enterprise/server/core/StartupBean$1.class")); testEar.delete(ArchivePaths .create("/rhq-server.jar/org/rhq/enterprise/server/core/ShutdownListener.class")); + testEar.delete(ArchivePaths + .create("/rhq-server.jar/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.class")); //replace the above startup beans with stripped down versions testEar.add(new ClassAsset(StrippedDownStartupBean.class), ArchivePaths @@ -359,6 +362,8 @@ public abstract class AbstractEJB3Test extends Arquillian { testEar.add(new ClassAsset(StrippedDownStartupBeanPreparation.class), ArchivePaths .create("/rhq-server.jar/org/rhq/enterprise/server/test/" + "StrippedDownStartupBeanPreparation.class")); + testEar.add(new ClassAsset(FakeStorageClusterSettingsManagerBean.class), ArchivePaths + .create("/rhq-server.jar/org/rhq/enterprise/server/storage/FakeStorageClusterSettingsManagerBean.class")); testEar.addAsManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml")); // add the test classes to the deployment diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 9e41692..e925de2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -36,10 +36,6 @@ import java.util.Map; import java.util.Queue; import java.util.Set; -import org.rhq.enterprise.server.storage.StorageClusterSettings; -import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerBean; -import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; - import javax.ejb.Asynchronous; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -88,6 +84,9 @@ import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; import org.rhq.enterprise.server.scheduler.SchedulerLocal; +import org.rhq.enterprise.server.storage.StorageClusterSettings; +import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerLocal; +import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; @@ -154,7 +153,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN private ResourceManagerLocal resourceManager; @EJB - private StorageClusterSettingsManagerBean storageClusterSettingsManager; + private StorageClusterSettingsManagerLocal storageClusterSettingsManager; @EJB private StorageNodeOperationsHandlerLocal storageNodeOperationsHandler; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java index 3e10a2f..9418bca 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerBean.java @@ -3,7 +3,7 @@ package org.rhq.enterprise.server.storage; import java.util.Map; import javax.ejb.EJB; -import javax.ejb.Singleton; +import javax.ejb.Stateless; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.common.composite.SystemSetting; @@ -13,12 +13,13 @@ import org.rhq.enterprise.server.system.SystemManagerLocal; /** * @author John Sanda */ -@Singleton -public class StorageClusterSettingsManagerBean { +@Stateless +public class StorageClusterSettingsManagerBean implements StorageClusterSettingsManagerLocal { @EJB private SystemManagerLocal systemManager; + @Override public StorageClusterSettings getClusterSettings(Subject subject) { SystemSettings settings = systemManager.getSystemSettings(subject); Map<String, String> settingsMap = settings.toMap(); @@ -41,6 +42,7 @@ public class StorageClusterSettingsManagerBean { return clusterSettings; } + @Override public void setClusterSettings(Subject subject, StorageClusterSettings clusterSettings) { SystemSettings settings = new SystemSettings(); settings.put(SystemSetting.STORAGE_CQL_PORT, Integer.toString(clusterSettings.getCqlPort())); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerLocal.java new file mode 100644 index 0000000..cb63bc4 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterSettingsManagerLocal.java @@ -0,0 +1,15 @@ +package org.rhq.enterprise.server.storage; + +import javax.ejb.Local; + +import org.rhq.core.domain.auth.Subject; + +/** + * @author John Sanda + */ +@Local +public interface StorageClusterSettingsManagerLocal { + StorageClusterSettings getClusterSettings(Subject subject); + + void setClusterSettings(Subject subject, StorageClusterSettings clusterSettings); +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java index 3e0eed8..1bf3cec 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java @@ -63,7 +63,7 @@ public class StorageNodeOperationsHandlerBean implements StorageNodeOperationsHa private OperationManagerLocal operationManager; @EJB - private StorageClusterSettingsManagerBean storageClusterSettingsManager; + private StorageClusterSettingsManagerLocal storageClusterSettingsManager; @EJB private StorageClientManagerBean storageClientManager; commit 8724984f76bf0f7f4738306045de36feba4ea2f3 Merge: 3d34ad8 fd55bc6 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Aug 13 15:40:11 2013 -0700 Merge branch 'mtho11/ie-chart-tooltips' commit fd55bc69e89433a25d37752e6cfb946fc6a4d35d Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Aug 13 15:32:30 2013 -0700 [BZ 949750] - Chart hovers fail to render in IE. Availability Chart hover fix. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 64c355d..59d4c75 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -250,6 +250,44 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("opacity", ".75") .attr("fill", function (d) { return calcBarFill(d); + }).on("mouseover",function (d) { + + var timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), + dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), + availStart = new Date(+d.availStart), + xPosition = parseFloat($wnd.d3.select(this).attr("x")), + availTooltipDiv = $wnd.d3.select("#availTooltip") + .style("left", xPosition + "px") + .style("top", "0px"); + + availTooltipDiv.select("#availTooltipLabel") + .text(availChartContext.hoverBarAvailabilityLabel); + + availTooltipDiv + .select("#availTooltipType") + .text(d.availTypeMessage); + + availTooltipDiv + .select("#availTooltipStartDate") + .text(dateFormatter(availStart)); + + availTooltipDiv + .select("#availTooltipStartTime") + .text(timeFormatter(availStart)); + + availTooltipDiv + .select("#availTooltipDurationLabel") + .text(availChartContext.hoverBarLabel); + + availTooltipDiv + .select("#availTooltipDuration") + .text(d.availDuration); + + //Show the tooltip + $wnd.d3.select("#availTooltip").classed("hidden", false); + }).on("mouseout", function () { + //Hide the tooltip + $wnd.d3.select("#availTooltip").classed("hidden", true); }); xAxis.tickFormat($wnd.rhqCommon.getD3CustomTimeFormat(availChartContext.chartXaxisTimeFormatHours, availChartContext.chartXaxisTimeFormatHoursMinutes)); @@ -295,42 +333,11 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { } - - function createHovers() { - $wnd.jQuery('svg rect.availBars').tipsy({ - gravity: 's', - html: true, - trigger: 'hover', - title: function () { - var d = this.__data__; - return formatHovers(d); - }, - show: function (e, el) { - el.css({ 'z-index': '990000'}) - } - }); - } - - - function formatHovers(d) { - var timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), - dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), - availStart = new Date(+d.availStart); - - return '<div class="chartHoverEnclosingDiv">' + - '<div class="chartHoverAlignLeft"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + d.availTypeMessage + '</span></div>' + - '<div class="chartHoverAlignLeft"><span>' + dateFormatter(availStart) + ' ' + timeFormatter(availStart) + '</span></div>' + - '<div class="chartHoverAlignLeft"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + d.availDuration + '</span></div>' + - '</div>'; - - } - return { // Public API draw: function (availChartContext) { "use strict"; drawBars(availChartContext); - createHovers(); } }; // end public closure diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java index 3fc0192..6e3b590 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityD3GraphView.java @@ -83,7 +83,22 @@ public class AvailabilityD3GraphView<T extends AvailabilityGraphType> extends En divAndSvgDefs.append("<div id=\"availChart-" + availabilityGraphType.getChartId() + "\" ><svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" style=\"height:65px;\">"); divAndSvgDefs.append(getSvgDefs()); - divAndSvgDefs.append("</svg></div>"); + divAndSvgDefs.append("</svg>"); + divAndSvgDefs.append("<div id=\"availTooltip\" class=\"hidden\" >"); + divAndSvgDefs.append("<div>"); + divAndSvgDefs.append("<span id=\"availTooltipLabel\" class=\"availTooltipLabel\"></span>"); + divAndSvgDefs.append("<span> : </span>"); + divAndSvgDefs.append("<span id=\"availTooltipType\" style=\"width:40px;font-weight:bold;\"></span>"); + divAndSvgDefs.append("<span> - </span>"); + divAndSvgDefs.append("<span id=\"availTooltipDuration\" ></span>"); + divAndSvgDefs.append("<div/>"); + divAndSvgDefs.append("<div>"); + divAndSvgDefs.append("<span id=\"availTooltipStartDate\" ></span>"); + divAndSvgDefs.append("<span> </span>"); + divAndSvgDefs.append("<span id=\"availTooltipStartTime\" ></span>"); + divAndSvgDefs.append("</div>"); + divAndSvgDefs.append("</div>"); // end availTooltipDiv + divAndSvgDefs.append("</div>"); HTMLFlow graph = new HTMLFlow(divAndSvgDefs.toString()); graph.setWidth100(); graph.setHeight(65); diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css index 2dbd79b..6a004b4 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css +++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css @@ -156,3 +156,39 @@ rect.low { font-weight: bold; color: #70c4e2; } + +#availTooltip { + z-index: 990000; + position: absolute; + width: 150px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.55; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#availTooltip.hidden { + display: none; +} + +#availTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 9px; + color: #d3d3d6; +} + +.availTooltipLabel { + width: 40px; + font-weight: bold; + color: #d3d3d6; +} + + commit 3d34ad80b5ca4d1adb0ec5828753761043904dad Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Aug 13 15:01:50 2013 -0400 fix some issues, add some new api methods diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml index 40e826a..5182ef1 100644 --- a/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml +++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.8.0.xml @@ -67,7 +67,7 @@ <difference> <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> <differenceType>7012</differenceType>  - <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, java.lang.String, java.lang.String)</method> + <method>org.rhq.core.domain.bundle.BundleGroup createBundleGroup(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.bundle.BundleGroup)</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> @@ -128,38 +128,45 @@ </difference> <difference> - <className>org/rhq/enterprise/server/bundle/RoleManagerRemote</className> + <className>org/rhq/enterprise/server/authz/RoleManagerRemote</className> <differenceType>7012</differenceType>  <method>void addBundleGroupsToRole(org.rhq.core.domain.auth.Subject, int, int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> <difference> - <className>org/rhq/enterprise/server/bundle/RoleManagerRemote</className> + <className>org/rhq/enterprise/server/authz/RoleManagerRemote</className> <differenceType>7012</differenceType>  <method>void addRolesToBundleGroup(org.rhq.core.domain.auth.Subject, int, int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> <difference> - <className>org/rhq/enterprise/server/bundle/RoleManagerRemote</className> + <className>org/rhq/enterprise/server/authz/RoleManagerRemote</className> <differenceType>7012</differenceType>  <method>void removeBundleGroupsFromRole(org.rhq.core.domain.auth.Subject, int, int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> <difference> - <className>org/rhq/enterprise/server/bundle/RoleManagerRemote</className> + <className>org/rhq/enterprise/server/authz/RoleManagerRemote</className> <differenceType>7012</differenceType>  <method>void removeRolesFromBundleGroup(org.rhq.core.domain.auth.Subject, int, int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> <difference> - <className>org/rhq/enterprise/server/bundle/RoleManagerRemote</className> + <className>org/rhq/enterprise/server/authz/RoleManagerRemote</className> <differenceType>7012</differenceType>  <method>void setAssignedBundleGroups(org.rhq.core.domain.auth.Subject, int, int[])</method> <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> </difference> + <difference> + <className>org/rhq/enterprise/server/bundle/BundleManagerRemote</className> + <differenceType>7012</differenceType>  + <method>org.rhq.core.domain.bundle.BundleGroup updateBundleGroup(org.rhq.core.domain.auth.Subject, org.rhq.core.domain.bundle.BundleGroup)</method> + <justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification> + </difference> + </differences> commit 2c874481d5b6f91ca916380633b11f1a45000510 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Mon Aug 12 15:17:15 2013 -0400 [BZ 990576] fix issue with available groups status update speed, guard against client failures and add more logging. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java index c4e7145..4cb1275 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java @@ -72,7 +72,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public static final String FIELD_DESCRIPTION = "description"; final TextItem searchTextItem = new TextItem(); protected int cursorPosition; - private static int retryAttempt = 0; + private static int retryAttempt = 0;//limit retries on failure + private static int noProgressAttempts = 0;//limit really slow attempt parse times //override the selector key for ldap group selection. protected String getSelectorKey() { @@ -263,6 +264,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c groupQueryStatus.setIcons(failIcon); groupQueryStatus.setDefaultValue(MSG.view_adminRoles_failLdapGroupsSettings()); CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdapGroupsSettings(), caught); + Log.debug(MSG.view_adminRoles_failLdapGroupsSettings()); } @Override @@ -308,6 +310,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c retryAttempt++; if (retryAttempt > 3) { cancel();//kill thread + Log.debug(MSG.view_adminRoles_failLdapRetry()); retryAttempt = 0; } } @@ -339,6 +342,10 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c pageCount = Integer.valueOf(value); } } + + if (resultCountValue == 0) { + noProgressAttempts++; + } //Update status information String warnTooManyResults = MSG.view_adminRoles_ldapWarnTooManyResults(); String warnQueryTakingLongResults = MSG.view_adminRoles_ldapWarnQueryTakingLongResults(); @@ -378,12 +385,15 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c if (resultCountValue > 20000) {//results throttled adviceItem.setValue(tooManyResults); adviceItem.setTooltip(tooManyResults); + Log.debug(tooManyResults);//log error to client. } else if ((current - start) >= 10 * 1000) {// took longer than 10s adviceItem.setValue(queryTookLongResults); adviceItem.setTooltip(queryTookLongResults); + Log.debug(queryTookLongResults);//log error to client. } else if (pageCount >= 20) {// required more than 20 pages of results adviceItem.setValue(queryTookManyPagesResults); adviceItem.setTooltip(queryTookManyPagesResults); + Log.debug(queryTookManyPagesResults);//log error to client. } else {//simple success. groupQueryStatus.setDefaultValue(success); groupQueryStatus.setIcons(successIcon); @@ -391,8 +401,19 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c adviceItem.setTooltip(none); adviceItem.setDisabled(true); } + noProgressAttempts = 0; //now cancel the timer cancel(); + } else if (noProgressAttempts >= 10) {//availGroups query stuck on server side + //cancel the timer. + cancel(); + String clientSideQuitting = MSG.view_adminRoles_failLdapCancelling();//catch all + adviceItem.setDisabled(false); + groupQueryStatus.setIcons(attentionIcon); + adviceItem.setValue(clientSideQuitting); + adviceItem.setTooltip(clientSideQuitting); + noProgressAttempts = 0; + Log.debug(clientSideQuitting);//log error to client. } availableGroupDetails.markForRedraw(); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 869a8ce..9fd2b24 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -512,9 +512,11 @@ view_adminRoles_assignedSubjects = Assigned Subjects view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP. view_adminRoles_failLdapAvailableGroups = Failed: Unable to retrieve status for latest AvailableGroups() call. +view_adminRoles_failLdapCancelling = Client unable to proceed. Cancelling all future available groups status checks for this thread. Likely 1)LDAP server communication failures or 2)ldap query checking inexplicably failed. view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups. view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role. view_adminRoles_failLdapGroupsSettings = Failed to retrieve system settings details for LDAP groups. +view_adminRoles_failLdapRetry = Retried 3 times. Cancelling future available group requests. view_adminRoles_failRoles = Failed to fetch roles. view_adminRoles_globalPerms = Global Permissions view_adminRoles_ldapGroups = LDAP Groups diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 4e6532d..dca98cb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -531,9 +531,11 @@ view_adminRoles_assignedSubjects = Přiřazené subjekty view_adminRoles_failCreateRoleWithExistingName = Nepodařilo se vytvořit roli s existujícím jménem [{0}]. Použíjte prosím jiné jméno. view_adminRoles_failLdap = Nepodařilo se určit je-li LDAP nastaven - předpokládám, že LDAP není přítomen. ##view_adminRoles_failLdapAvailableGroups = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. +##view_adminRoles_failLdapCancelling = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failLdapGroups = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failLdapGroupsRole = Nepodařilo se získat informace o LDAP skupinách pro roli. ##view_adminRoles_failLdapGroupsSettings = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. +##view_adminRoles_failLdapRetry = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failRoles = Nepodařilo se získat role. view_adminRoles_globalPerms = Globalní povolení view_adminRoles_ldapGroups = LDAP skupiny diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index c50c577..8e76bca 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -509,9 +509,11 @@ view_adminRoles_assignedSubjects = Zugewisene Benutzer view_adminRoles_failCreateRoleWithExistingName = Konnte die Rolle mit dem existierenden Namen [{0}] nicht anlegen. Bitte wählen Sie einen anderen Namen. view_adminRoles_failLdap = Konnte nicht ermitteln, ob LDAP konfiguriert ist - gehe von keiner LDAP-Konfiguration aus. ##view_adminRoles_failLdapAvailableGroups = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. +##view_adminRoles_failLdapCancelling = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failLdapGroups = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failLdapGroupsRole = Konnte die LDAP-Gruppen für die Rolle nicht laden. ##view_adminRoles_failLdapGroupsSettings = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. +##view_adminRoles_failLdapRetry = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failRoles = Konnte die Rollen nicht laden. view_adminRoles_globalPerms = Applikationsweite Rechte view_adminRoles_ldapGroups = LDAP-Gruppen diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 54fef87..a8e5795 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -508,9 +508,11 @@ view_adminRoles_assignedSubjects = 割り当てられたSubjects ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = LDAPが構成されたかどうかの決定に失敗しました - LDAPが無いことを仮定します ##view_adminRoles_failLdapAvailableGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します +##view_adminRoles_failLdapCancelling = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failLdapGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failLdapGroupsRole = ロールのために利用可能なLDAPグループをロードするのに失敗しました ##view_adminRoles_failLdapGroupsSettings = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します +##view_adminRoles_failLdapRetry = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failRoles = ロールの取り出しに失敗しました view_adminRoles_globalPerms = グローバル権限 view_adminRoles_ldapGroups = LDAPグループ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 4deaf49..872ad93 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -459,9 +459,11 @@ view_adminRoles_assignedSubjects = 할당된 Subjects view_adminRoles_failCreateRoleWithExistingName = 기존 이름 [{0}]과 역할을 만들지 못했습니다. 다른 이름을 사용하십시오. view_adminRoles_failLdap = LDAP이 설정되었는지 여부의 결정에 실패했습니다 - LDAP이 없는 것을 가정합니다. ##view_adminRoles_failLdapAvailableGroups = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. +##view_adminRoles_failLdapCancelling = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failLdapGroups = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failLdapGroupsRole = 역할을 위해 사용가능한 LDAP 그룹을 로드하느데 실패했습니다. ##view_adminRoles_failLdapGroupsSettings = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. +##view_adminRoles_failLdapRetry = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failRoles = 역할 제거에 실패했습니다. view_adminRoles_globalPerms = 글로벌 권한 view_adminRoles_ldapGroups = LDAP 그룹 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 35d2aec..9a4e437 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -514,9 +514,11 @@ view_adminRoles_assignedSubjects = Perfis Associados ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name. view_adminRoles_failLdap = Falha ao determinar se o LDAP foi configurado - assumindo como LDAP n\u00E3o configurado. ##view_adminRoles_failLdapAvailableGroups = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. +##view_adminRoles_failLdapCancelling = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failLdapGroups = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failLdapGroupsRole = Falha ao carregar grupos do LDAP dispon\u00EDveis para o perfil. ##view_adminRoles_failLdapGroupsSettings = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. +##view_adminRoles_failLdapRetry = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failRoles = Falha ao recuperar perfis. view_adminRoles_globalPerms = Permiss\u00F5es Globais view_adminRoles_ldapGroups = Grupos LDAP diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 3035f91..d978d76 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2595,14 +2595,15 @@ view_adminRoles_assignedSubjects = Назначенные субъекты ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = Не удалось определить, настроен ли LDAP - предположительно LDAP отсутствует. ##view_adminRoles_failLdapAvailableGroups = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют +##view_adminRoles_failLdapCancelling = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failLdapGroups = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failLdapGroupsRole = Не удалось загрузить LDAP группы, доступные для роли. ##view_adminRoles_failLdapGroupsSettings = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют +##view_adminRoles_failLdapRetry = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failRoles = Не удалось получить роли. view_adminRoles_globalPerms = Глобальные полномочия view_adminRoles_ldapGroups = LDAP-группы view_adminRoles_ldapGroupsReadOnly = данные LDAP групп доступны только для чтения -##view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. ##view_adminRoles_ldapGroupsSettingsReadOnly = данные LDAP групп доступны только для чтения ##view_adminRoles_ldapQueryPageSize = Полномочия ресурса ##view_adminRoles_ldapTooManyResults = данные LDAP групп доступны только для чтения @@ -2611,6 +2612,7 @@ view_adminRoles_ldapGroupsReadOnly = данные LDAP групп доступн ##view_adminRoles_ldapWarnParsingManyPagesResults = данные LDAP групп доступны только для чтения ##view_adminRoles_ldapWarnQueryTakingLongResults = данные LDAP групп доступны только для чтения ##view_adminRoles_ldapWarnTooManyResults = данные LDAP групп доступны только для чтения +##view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Автоматически отключено CONFIGURE_WRITE полномочие, поскольку отсутствует CONFIGURE_READ... view_adminRoles_permissions_autoselecting_configureWrite_implied = Автоматически выбрано CONFIGURE_READ полномочие, поскольку CONFIGURE_WRITE подразумевает, что ... ##view_adminRoles_permissions_autoselecting_manageBundleGroups_implied = Autoselected View Bundles, which is granted by Manage Bundle Groups... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 615d3a0..b4f0369 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -502,9 +502,11 @@ view_adminRoles_assignedSubjects = \u5206\u914d\u7684\u4e3b\u9898 ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name. view_adminRoles_failLdap = \u65e0\u6cd5\u786e\u5b9aLDAP - \u5047\u5b9a\u6ca1\u6709LDAP. ##view_adminRoles_failLdapAvailableGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. +##view_adminRoles_failLdapCancelling = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failLdapGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failLdapGroupsRole = \u52a0\u8f7dLDAP\u7ec4\u89d2\u8272\u5931\u8d25. ##view_adminRoles_failLdapGroupsSettings = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. +##view_adminRoles_failLdapRetry = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failRoles = \u53d6\u5f97\u89d2\u8272\u5931\u8d25. view_adminRoles_globalPerms = \u5168\u5c40\u6388\u6743 view_adminRoles_ldapGroups = LDAP\u7ec4 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index dc53a3c..5c8031d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -604,7 +604,13 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" entry.put("name", name); entry.put("description", description); groupDetailsMap.add(entry); - resultCount++; + + resultCount++;//monitor the number of groups returned during this query. + groupQueryResultCount = resultCount;//update result count + if (groupQueryPageCount == 0) { + groupQueryPageCount++; + } + groupQueryCurrentTime = System.currentTimeMillis(); } } commit 6d7689daeff6504e5c3d4178cc0480525a3e7d7a Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Fri Aug 9 16:46:29 2013 -0400 [BZ 990576] add I18N for new fields. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java index 8d53b82..c4e7145 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java @@ -97,16 +97,13 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c int groupPanelWidth = 375; int groupPanelHeight = 150; - // final TextItem search = new TextItem("search", - // MSG.common_title_search()); - // Structure the display area into two separate display regions // Available Groups region final DynamicForm availableGroupDetails = new DynamicForm(); { availableGroupDetails.setWidth(groupPanelWidth); availableGroupDetails.setHeight(groupPanelHeight); - availableGroupDetails.setGroupTitle("Available Groups Results"); + availableGroupDetails.setGroupTitle(MSG.common_title_ldapGroupsAvailable()); availableGroupDetails.setIsGroup(true); availableGroupDetails.setWrapItemTitles(false); //add itemChanged handler to listen for changes to SearchItem @@ -129,21 +126,21 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c } }); } - final TextItem resultCountItem = new TextItem("resultCount", "Groups Found"); + final TextItem resultCountItem = new TextItem("resultCount", MSG.common_title_groupsFound()); { resultCountItem.setCanEdit(false); resultCountItem.setWidth("100%"); } - final TextItem pageCountItem = new TextItem("pageCount", "Query Pages Parsed"); + final TextItem pageCountItem = new TextItem("pageCount", MSG.common_title_queryPagesParsed()); { pageCountItem.setCanEdit(false); pageCountItem.setWidth("100%"); } - final TextAreaItem adviceItem = new TextAreaItem("advice", "Suggest"); + final TextAreaItem adviceItem = new TextAreaItem("advice", MSG.common_title_suggest()); { adviceItem.setWidth("100%"); adviceItem.setHeight(20); - String feedback = "(None)"; + String feedback = MSG.common_val_none(); adviceItem.setValue(feedback); adviceItem.setTooltip(feedback); adviceItem.setDisabled(true); @@ -162,13 +159,12 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c } }); } - // final TextItem search = new TextItem("search", - // MSG.common_title_search()); + //Customize Search component { - searchTextItem.setName("search"); - searchTextItem.setTitle("Filter[results below]"); + searchTextItem.setName(MSG.common_title_search()); + searchTextItem.setTitle(MSG.common_title_filterResultsBelow()); searchTextItem.setWidth("100%"); - searchTextItem.setTooltip("Start typing here to only show groups containing the typed characters."); + searchTextItem.setTooltip(MSG.common_msg_typeToFilterResults()); } final FormItemIcon loadingIcon = new FormItemIcon(); final FormItemIcon successIcon = new FormItemIcon(); @@ -186,8 +182,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c final StaticTextItem groupQueryStatus = new StaticTextItem(); { groupQueryStatus.setName("groupQueryStatus"); - groupQueryStatus.setTitle("Query Progress"); - groupQueryStatus.setDefaultValue("Loading..."); + groupQueryStatus.setTitle(MSG.common_title_queryProgress()); + groupQueryStatus.setDefaultValue(MSG.common_msg_loading()); groupQueryStatus.setIcons(loadingIcon); } availableGroupDetails.setItems(resultCountItem, pageCountItem, groupQueryStatus, adviceItem, searchTextItem); @@ -197,21 +193,22 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c { ldapGroupSettings.setWidth(groupPanelWidth); ldapGroupSettings.setHeight(groupPanelHeight); - ldapGroupSettings.setGroupTitle("[Read Only] Ldap Group Settings. Edit in 'System Settings'"); + ldapGroupSettings.setGroupTitle(MSG.view_adminRoles_ldapGroupsSettingsReadOnly()); ldapGroupSettings.setIsGroup(true); ldapGroupSettings.setWrapItemTitles(false); } - final TextItem groupSearch = new TextItem("groupSearch", "Search Filter"); + final TextItem groupSearch = new TextItem("groupSearch", MSG.view_admin_systemSettings_LDAPFilter_name()); { groupSearch.setCanEdit(false); groupSearch.setWidth("100%"); } - final TextItem groupMember = new TextItem("groupMember", "Member Filter"); + final TextItem groupMember = new TextItem("groupMember", MSG.view_admin_systemSettings_LDAPGroupMember_name()); { groupMember.setCanEdit(false); groupMember.setWidth("100%"); } - final CheckboxItem groupQueryPagingItem = new CheckboxItem("groupQueryEnable", "Query Paging Enabled"); + final CheckboxItem groupQueryPagingItem = new CheckboxItem("groupQueryEnable", + MSG.view_admin_systemSettings_LDAPGroupUsePaging_name()); { groupQueryPagingItem.setCanEdit(false); groupQueryPagingItem.setValue(false); @@ -221,12 +218,14 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c //You have to set this attribute groupQueryPagingItem.setAttribute("labelAsTitle", true); } - final TextItem groupQueryPagingCountItem = new TextItem("groupQueryCount", "Query Page Size"); + final TextItem groupQueryPagingCountItem = new TextItem("groupQueryCount", + MSG.view_adminRoles_ldapQueryPageSize()); { groupQueryPagingCountItem.setCanEdit(false); groupQueryPagingCountItem.setWidth("100%"); } - final CheckboxItem groupUsePosixGroupsItem = new CheckboxItem("groupUsePosixGroups", "Use Posix Enabled"); + final CheckboxItem groupUsePosixGroupsItem = new CheckboxItem("groupUsePosixGroups", + MSG.view_admin_systemSettings_LDAPGroupUsePosixGroup_name()); { groupUsePosixGroupsItem.setCanEdit(false); groupUsePosixGroupsItem.setValue(false); @@ -262,9 +261,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c @Override public void onFailure(Throwable caught) { groupQueryStatus.setIcons(failIcon); - groupQueryStatus.setDefaultValue("Fail: Unable to retrieve system settings."); - //TODO: update this message - CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + groupQueryStatus.setDefaultValue(MSG.view_adminRoles_failLdapGroupsSettings()); + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdapGroupsSettings(), caught); } @Override @@ -291,10 +289,10 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c //launch operations to populate/refresh LDAP Group Query contents. final Timer availableGroupsTimer = new Timer() { public void run() { - final String attention = "Attention"; - final String success = "Success"; - final String none = "(None)"; - final String failed = "Failed"; + final String attention = MSG.common_status_attention(); + final String success = MSG.common_status_success(); + final String none = MSG.common_val_none(); + final String failed = MSG.common_status_failed(); //make request to RHQ about state of latest LDAP GWT request GWTServiceLookup.getLdapService().findAvailableGroupsStatus( new AsyncCallback<Set<Map<String, String>>>() { @@ -302,11 +300,11 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public void onFailure(Throwable caught) { groupQueryStatus.setIcons(failIcon); groupQueryStatus.setDefaultValue(failed); - String adviceValue = "Failed: Unable to retrieve status for latest AvailableGroups() call."; + String adviceValue = MSG.view_adminRoles_failLdapAvailableGroups(); adviceItem.setValue(adviceValue); adviceItem.setTooltip(adviceValue); - //TODO: update this message - CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + CoreGUI.getErrorHandler() + .handleError(MSG.view_adminRoles_failLdapAvailableGroups(), caught); retryAttempt++; if (retryAttempt > 3) { cancel();//kill thread @@ -342,9 +340,10 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c } } //Update status information - String warnTooManyResults = " A lot of results are being returned. Modify your 'Group Search Filter' to return fewer results."; - String warnQueryTakingLongResults = " Query taking a while to complete. Modify your 'Group Search Filter' to return fewer results."; - String warnParsingManyPagesResults = " Query requires a lot of pages. Modify your 'Group Search Page Size' to return more results per request."; + String warnTooManyResults = MSG.view_adminRoles_ldapWarnTooManyResults(); + String warnQueryTakingLongResults = MSG.view_adminRoles_ldapWarnQueryTakingLongResults(); + String warnParsingManyPagesResults = MSG.view_adminRoles_ldapWarnParsingManyPagesResults(); + boolean resultCountWarning = false; boolean pageCountWarning = false; boolean timePassingWarning = false; @@ -368,12 +367,11 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c //act on status details to add extra perf suggestions. Kill threads older than 30 mins long parseTime = System.currentTimeMillis() - ldapGroupSelectorRequestId; if ((queryCompleted) || (parseTime) > 30 * 60 * 1000) { - String tooManyResults = "Too many results to show all. Modify your 'Group Search Filter' to return fewer than 20000 results."; - String queryTookLongResults = " Query took " + parseTime - + " ms to complete. Modify your 'Group Search Filter' to return fewer results."; - String queryTookManyPagesResults = " Query required " - + pageCount - + " pages to complete. Modify 'Group Search Page Size' to return more results per request."; + String tooManyResults = MSG.view_adminRoles_ldapTooManyResults(); + String queryTookLongResults = MSG.view_adminRoles_ldapTookLongResults(parseTime + ""); + String queryTookManyPagesResults = MSG + .view_adminRoles_ldapTookManyPagesResults(pageCount + ""); + adviceItem.setDisabled(false); groupQueryStatus.setIcons(attentionIcon); groupQueryStatus.setDefaultValue(attention); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 67ec087..869a8ce 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -136,11 +136,13 @@ common_msg_noItemsToShow = No items to show common_msg_notYetImplemented = Not Yet Implemented common_msg_see_more = see more... common_msg_step_x_of_y = Step {0} of {1} +common_msg_typeToFilterResults = Start typing here to only show results containing the typed characters. common_severity_debug = Debug common_severity_error = Error common_severity_fatal = Fatal common_severity_info = Info common_severity_warn = Warn +common_status_attention = Attention common_status_canceled = Canceled common_status_deferred = Deferred common_status_failed = Failed @@ -192,11 +194,13 @@ common_title_edit = Edit? common_title_edit_mode = Edit Mode common_title_enabled = Enabled? common_title_end = End +common_title_filterResultsBelow = Filter[results below] common_title_generalProp = General Properties common_title_group = Group common_title_group_def_total = Group Definition Total common_title_group_member_health = Group Member Health common_title_groups = Groups +common_title_groupsFound = Groups Found common_title_help = Help common_title_host = Host common_title_id = ID @@ -210,6 +214,7 @@ common_title_kind = Kind common_title_lastUpdated = Last Updated common_title_lastUpdatedBy = Last Updated By common_title_ldapGroups = LDAP Groups +common_title_ldapGroupsAvailable = Available Groups Results common_title_mashup = Mashup common_title_members_reporting = Members Reporting common_title_message = Message @@ -234,6 +239,8 @@ common_title_platform_total = Platform Total common_title_plugin = Plugin common_title_port = Port common_title_providers = Providers +common_title_queryPagesParsed = Query Pages Parsed +common_title_queryProgress = Query Progress common_title_recent_alerts = Recent Alerts common_title_recent_bundle_deployments = Recent Bundle Deployments common_title_recent_configuration_updates = Recent Configuration Updates @@ -273,6 +280,7 @@ common_title_sort_order_tooltip = Sets sort order for results. common_title_start = Start common_title_status = Status common_title_stop = Stop +common_title_suggest = Suggest common_title_summary = Summary common_title_tag_cloud = Tag Cloud common_title_the = The @@ -503,12 +511,22 @@ view_adminRoles_assignedGroups = Assigned Resource Groups view_adminRoles_assignedSubjects = Assigned Subjects view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP. +view_adminRoles_failLdapAvailableGroups = Failed: Unable to retrieve status for latest AvailableGroups() call. view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups. view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role. +view_adminRoles_failLdapGroupsSettings = Failed to retrieve system settings details for LDAP groups. view_adminRoles_failRoles = Failed to fetch roles. view_adminRoles_globalPerms = Global Permissions view_adminRoles_ldapGroups = LDAP Groups view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only +view_adminRoles_ldapGroupsSettingsReadOnly = [Read Only] Ldap Group Settings. Edit in 'System Settings' +view_adminRoles_ldapQueryPageSize = Query Page Size +view_adminRoles_ldapTooManyResults = Too many results to show all. Modify your 'Group Search Filter' to return fewer than 20000 results. +view_adminRoles_ldapTookLongResults = Query took {0} ms to complete. Modify your 'Group Search Filter' to return fewer results. +view_adminRoles_ldapTookManyPagesResults = Query required {0} pages to complete. Modify 'Group Search Page Size' to return more results per request. +view_adminRoles_ldapWarnParsingManyPagesResults = Query requires a lot of pages. Modify your 'Group Search Page Size' to return more results per request. +view_adminRoles_ldapWarnQueryTakingLongResults = \ Query taking a while to complete. Modify your 'Group Search Filter' to return fewer results. +view_adminRoles_ldapWarnTooManyResults = \ A lot of results are being returned. Modify your 'Group Search Filter' to return fewer results. view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 2c97c84..4e6532d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -159,11 +159,13 @@ common_msg_noItemsToShow = Žádné položky k zobrazení common_msg_notYetImplemented = Ještě nebylo implementováno common_msg_see_more = více... common_msg_step_x_of_y = Krok {0} z {1} +##common_msg_typeToFilterResults = Ještě nebylo implementováno common_severity_debug = Ladění common_severity_error = Chyba common_severity_fatal = Fatální common_severity_info = Informační common_severity_warn = Varování +##common_status_attention = Úspěch common_status_canceled = Zrušeno common_status_deferred = Odloženo common_status_failed = Selhalo @@ -215,11 +217,13 @@ common_title_edit_mode = Editační mód common_title_enabled = Povoleno? common_title_end = Konec common_title_favorites = Oblíbené +##common_title_filterResultsBelow = Oblíbené common_title_generalProp = Obecné vlastnosti common_title_group = Skupina common_title_group_def_total = Definic skupin celkem common_title_group_member_health = Zdraví člena skupiny common_title_groups = Skupiny +##common_title_groupsFound = Skupiny common_title_help = Nápověda common_title_host = Host common_title_icon = Ikona @@ -234,6 +238,7 @@ common_title_kind = Druh common_title_lastUpdated = Naposledy modifikováno common_title_lastUpdatedBy = Naposledy modifikoval common_title_ldapGroups = LDAP skupiny +##common_title_ldapGroupsAvailable = LDAP skupiny common_title_mashup = Mashup common_title_members_reporting = Reportování členů common_title_message = Zpráva @@ -258,6 +263,8 @@ common_title_platform_total = Celkem platforem common_title_plugin = Zásuvný modul common_title_port = Port common_title_providers = Poskytovatelé +##common_title_queryPagesParsed = LDAP skupiny +##common_title_queryProgress = LDAP skupiny common_title_recent_alerts = Nedávné výstrahy common_title_recent_bundle_deployments = Nedávno nasazené balíky common_title_recent_configuration_updates = Nedávno změněné konfigurace @@ -297,6 +304,7 @@ common_title_sort_order_tooltip = Nastaví řazení pro výsledky. common_title_start = Start common_title_status = Stav common_title_stop = Stop +##common_title_suggest = Shrnutí common_title_summary = Shrnutí common_title_tag_cloud = Tag cloud common_title_timestamp = Datum/Čas @@ -522,12 +530,22 @@ view_adminRoles_assignedGroups = Přiřazené skupiny zdrojů view_adminRoles_assignedSubjects = Přiřazené subjekty view_adminRoles_failCreateRoleWithExistingName = Nepodařilo se vytvořit roli s existujícím jménem [{0}]. Použíjte prosím jiné jméno. view_adminRoles_failLdap = Nepodařilo se určit je-li LDAP nastaven - předpokládám, že LDAP není přítomen. +##view_adminRoles_failLdapAvailableGroups = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failLdapGroups = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failLdapGroupsRole = Nepodařilo se získat informace o LDAP skupinách pro roli. +##view_adminRoles_failLdapGroupsSettings = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen. view_adminRoles_failRoles = Nepodařilo se získat role. view_adminRoles_globalPerms = Globalní povolení view_adminRoles_ldapGroups = LDAP skupiny view_adminRoles_ldapGroupsReadOnly = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapGroupsSettingsReadOnly = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapQueryPageSize = Oprávnění zdroje +##view_adminRoles_ldapTooManyResults = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapTookLongResults = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapTookManyPagesResults = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapWarnParsingManyPagesResults = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapWarnQueryTakingLongResults = data LDAP skupiny jsou jen pro čtení +##view_adminRoles_ldapWarnTooManyResults = data LDAP skupiny jsou jen pro čtení view_adminRoles_noLdap = Integrace LDAP není nakonfigurována. K nastavení řízení bezpečnosti přes LDAP prosím navštivte <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Automaticky odoznačeno CONFIGURE_WRITE povolení, protože absence CONFIGURE_READ to implikuje... view_adminRoles_permissions_autoselecting_configureWrite_implied = Automaticky označeno CONFIGURE_READ povolení, protože CONFIGURE_WRITE jej implikuje... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index d4f053b..c50c577 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -139,11 +139,13 @@ common_msg_noItemsToShow = Keine Einträge vorhanden common_msg_notYetImplemented = Noch nicht implementiert common_msg_see_more = mehr ... common_msg_step_x_of_y = Schritt {0} von {1} +##common_msg_typeToFilterResults = Noch nicht implementiert common_severity_debug = Debug common_severity_error = Fehler common_severity_fatal = Fatal common_severity_info = Information common_severity_warn = Warnung +##common_status_attention = Erfolg common_status_canceled = Abgebrochen common_status_deferred = Verzögert common_status_failed = Fehlgeschlagen @@ -199,6 +201,7 @@ common_title_group = Gruppe common_title_group_def_total = Anzahl Gruppen-Definitionen common_title_group_member_health = Zustand der Gruppenmitglieder common_title_groups = Gruppen +##common_title_groupsFound = Gruppen common_title_help = Hilfe common_title_host = Rechner common_title_id = ID @@ -211,6 +214,7 @@ common_title_kind = Art common_title_lastUpdated = Zuletzt aktualisiert common_title_lastUpdatedBy = Zuletzt aktualisiert durch common_title_ldapGroups = LDAP-Gruppen +##common_title_ldapGroupsAvailable = LDAP-Gruppen ##common_title_mashup = Mashup common_title_members_reporting = Anzahl berichtender Mitglieder common_title_message = Nachricht @@ -235,6 +239,8 @@ common_title_platform_total = Anzahl Platformen common_title_plugin = Plugin common_title_port = Port common_title_providers = Anbieter +##common_title_queryPagesParsed = LDAP-Gruppen +##common_title_queryProgress = LDAP-Gruppen common_title_recent_alerts = Kürzlich ausgelöste Alarme common_title_recent_bundle_deployments = Kürzliche Bundle-Deployments common_title_recent_configuration_updates = Frische Konfigurationsaktualisierungen @@ -274,6 +280,7 @@ common_title_sort_order_tooltip = Legt die Sortierreihenfolge für Ergebnisse fe common_title_start = Start common_title_status = Status common_title_stop = Stop +##common_title_suggest = Zusammenfassung common_title_summary = Zusammenfassung common_title_tag_cloud = Tag-Wolke common_title_the = Die @@ -501,12 +508,22 @@ view_adminRoles_assignedGroups = Zugewiesene Ressourcen-Gruppen view_adminRoles_assignedSubjects = Zugewisene Benutzer view_adminRoles_failCreateRoleWithExistingName = Konnte die Rolle mit dem existierenden Namen [{0}] nicht anlegen. Bitte wählen Sie einen anderen Namen. view_adminRoles_failLdap = Konnte nicht ermitteln, ob LDAP konfiguriert ist - gehe von keiner LDAP-Konfiguration aus. +##view_adminRoles_failLdapAvailableGroups = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failLdapGroups = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failLdapGroupsRole = Konnte die LDAP-Gruppen für die Rolle nicht laden. +##view_adminRoles_failLdapGroupsSettings = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt. view_adminRoles_failRoles = Konnte die Rollen nicht laden. view_adminRoles_globalPerms = Applikationsweite Rechte view_adminRoles_ldapGroups = LDAP-Gruppen view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapGroupsSettingsReadOnly = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapQueryPageSize = Rechte auf Ressourcen +##view_adminRoles_ldapTooManyResults = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapTookLongResults = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapTookManyPagesResults = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapWarnParsingManyPagesResults = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapWarnQueryTakingLongResults = LDAP Gruppendaten können nur gelesen werden +##view_adminRoles_ldapWarnTooManyResults = LDAP Gruppendaten können nur gelesen werden view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu konfigurieren, wechseln sie zu <a {0}>{1}</a>. ##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... ##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index c7c1f0a..54fef87 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -138,11 +138,13 @@ common_msg_noItemsToShow = 表示する項目はありません common_msg_notYetImplemented = 実装されていません common_msg_see_more = 詳細... common_msg_step_x_of_y = ステップ {1} 中 {0} 番め +##common_msg_typeToFilterResults = 実装されていません common_severity_debug = デバッグ common_severity_error = エラー common_severity_fatal = 致命的 common_severity_info = 情報 common_severity_warn = 警告 +##common_status_attention = 成功 common_status_canceled = キャンセル common_status_deferred = 延期 common_status_failed = 失敗 @@ -199,6 +201,7 @@ common_title_group = グループ common_title_group_def_total = グループ定義の合計 common_title_group_member_health = グループメンバーの状態 common_title_groups = グループ +##common_title_groupsFound = グループ common_title_help = ヘルプ common_title_host = ホスト common_title_id = ID @@ -212,6 +215,7 @@ common_title_kind = 種類 common_title_lastUpdated = 最終更新 common_title_lastUpdatedBy = 最終更新（による） common_title_ldapGroups = LDAPグループ +##common_title_ldapGroupsAvailable = LDAPグループ common_title_mashup = マッシュアップ common_title_members_reporting = メンバーのリポート common_title_message = メッセージ @@ -236,6 +240,8 @@ common_title_platform_total = プラットフォームの合計 common_title_plugin = プラグイン common_title_port = ポート common_title_providers = プロバイダ +##common_title_queryPagesParsed = LDAPグループ +##common_title_queryProgress = LDAPグループ common_title_recent_alerts = 最近のアラート common_title_recent_bundle_deployments = 最近のバンドルのデプロイ common_title_recent_configuration_updates = 最近の構成の更新 @@ -275,6 +281,7 @@ common_title_sort_order_tooltip = 結果のソート順を設定 common_title_start = 開始 common_title_status = ステータス common_title_stop = 停止 +##common_title_suggest = サマリ common_title_summary = サマリ common_title_tag_cloud = タグクラウド common_title_timestamp = 日付/時間 @@ -500,12 +507,22 @@ view_adminRoles_assignedGroups = 割り当てられたリソースグループ view_adminRoles_assignedSubjects = 割り当てられたSubjects ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = LDAPが構成されたかどうかの決定に失敗しました - LDAPが無いことを仮定します +##view_adminRoles_failLdapAvailableGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failLdapGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failLdapGroupsRole = ロールのために利用可能なLDAPグループをロードするのに失敗しました +##view_adminRoles_failLdapGroupsSettings = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します view_adminRoles_failRoles = ロールの取り出しに失敗しました view_adminRoles_globalPerms = グローバル権限 view_adminRoles_ldapGroups = LDAPグループ view_adminRoles_ldapGroupsReadOnly = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapGroupsSettingsReadOnly = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapQueryPageSize = リソース権限 +##view_adminRoles_ldapTooManyResults = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapTookLongResults = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapTookManyPagesResults = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapWarnParsingManyPagesResults = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapWarnQueryTakingLongResults = LDAPグループデータは読み出し専用です +##view_adminRoles_ldapWarnTooManyResults = LDAPグループデータは読み出し専用です view_adminRoles_noLdap = LDAPセキュリティの統合は構成されていません。LDAPを構成するには、 <a {0}>{1}</a>に行ってください。 view_adminRoles_permissions_autoselecting_configureRead_implied = CONFIGURE_WRITE権限が自動的に選択されました。なぜなら、CONFIGURE_READが無いことがそれを暗示しているからです。 view_adminRoles_permissions_autoselecting_configureWrite_implied = CONFIGURE_READ権限が自動的に選択されました。なぜなら、CONFIGURE_WRITEがそれを暗示しているからです。 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index 0213540..4deaf49 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -132,10 +132,12 @@ common_msg_noItemsToShow = 표시할 항목이 없습니다. common_msg_notYetImplemented = 구현되지 않았습니다. common_msg_see_more = 자세히보기... common_msg_step_x_of_y = 단계 {0} 중 {1} 번째 +##common_msg_typeToFilterResults = 구현되지 않았습니다. common_severity_debug = 디버그 common_severity_error = 에러 common_severity_info = 정보 common_severity_warn = 경고 +##common_status_attention = 성공 common_status_canceled = 취소 common_status_deferred = 연기 common_status_failed = 실패 @@ -187,6 +189,7 @@ common_title_group = 그룹 common_title_group_def_total = 전체 그룹 정의 common_title_group_member_health = 그룹멤버 상태 common_title_groups = 그룹 +##common_title_groupsFound = 그룹 common_title_help = 도움말 common_title_host = 호스트 common_title_id = ID @@ -197,6 +200,7 @@ common_title_inventory = 인벤토리 common_title_inventoryStatus = 인벤토리 상태 common_title_inventorySummary = 인벤토리 요약 common_title_ldapGroups = LDAP 그룹 +##common_title_ldapGroupsAvailable = LDAP 그룹 common_title_members_reporting = 멤버 리포트 common_title_message = 메시지 common_title_metric = 측정 항목 @@ -219,6 +223,8 @@ common_title_platform_total = 전체 플랫폼 common_title_plugin = 플러그인 common_title_port = 포트 common_title_providers = 공급자 +##common_title_queryPagesParsed = LDAP 그룹 +##common_title_queryProgress = LDAP 그룹 common_title_recent_alerts = 최근 알림 common_title_recent_bundle_deployments = 최근 번들 배포 common_title_recent_drifts = 최근 드리프트 @@ -254,6 +260,7 @@ common_title_sort_order_tooltip = 결과의 정렬 순서를 설정 common_title_start = 시작 common_title_status = 상태 common_title_stop = 정지 +##common_title_suggest = 요약 common_title_summary = 요약 common_title_tag_cloud = 태그 클라우드 common_title_timestamp = 날짜/시간 @@ -451,12 +458,15 @@ view_adminRoles_assignedGroups = 할당된 자원 그룹 view_adminRoles_assignedSubjects = 할당된 Subjects view_adminRoles_failCreateRoleWithExistingName = 기존 이름 [{0}]과 역할을 만들지 못했습니다. 다른 이름을 사용하십시오. view_adminRoles_failLdap = LDAP이 설정되었는지 여부의 결정에 실패했습니다 - LDAP이 없는 것을 가정합니다. +##view_adminRoles_failLdapAvailableGroups = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failLdapGroups = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failLdapGroupsRole = 역할을 위해 사용가능한 LDAP 그룹을 로드하느데 실패했습니다. +##view_adminRoles_failLdapGroupsSettings = 사용가능한 LDAP 그룹을 읽는데 실패했습니다 - LDAP 그룹이 없는 것을 가정합니다. view_adminRoles_failRoles = 역할 제거에 실패했습니다. view_adminRoles_globalPerms = 글로벌 권한 view_adminRoles_ldapGroups = LDAP 그룹 ##view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only +##view_adminRoles_ldapQueryPageSize = 리소스 권한 view_adminRoles_noLdap = LDAP 보안 통합이 설정되지 않았습니다. LDAP을 구성하려면 <a {0}>{1}</a>로 가십시요. ##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... ##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 952b01f..35d2aec 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -135,11 +135,13 @@ common_msg_noItemsToShow = N\u00E3o existem itens para apresentar common_msg_notYetImplemented = N\u00E3o implementado ainda common_msg_see_more = Ver detalhes... common_msg_step_x_of_y = Passo {0} de {1} +##common_msg_typeToFilterResults = N\u00E3o implementado ainda ##common_severity_debug = Debug common_severity_error = Erro ##common_severity_fatal = Fatal ##common_severity_info = Info ##common_severity_warn = Warn +##common_status_attention = Sucesso common_status_canceled = Cancelado common_status_deferred = Deferido common_status_failed = Falha @@ -191,11 +193,13 @@ common_title_edit_mode = Modo Edi\u00E7\u00E3o common_title_enabled = Habilitado? common_title_end = Fim common_title_favorites = Favoritos +##common_title_filterResultsBelow = Favoritos common_title_generalProp = Propriedades Gerais common_title_group = Grupo common_title_group_def_total = Total de Defini\u00E7\u00E3o de Grupos common_title_group_member_health = Sa\u00FAde do Membro do Grupo common_title_groups = Grupos +##common_title_groupsFound = Grupos common_title_help = Ajuda common_title_host = Host common_title_icon = \u00EDcone @@ -209,6 +213,7 @@ common_title_inventorySummary = Sum\u00E1rio do Invent\u00E1rio common_title_lastUpdated = \u00DAltima Atualiza\u00E7\u00E3o common_title_lastUpdatedBy = \u00DAltima Atualiza\u00E7\u00E3o feita por common_title_ldapGroups = Grupos LDAP +##common_title_ldapGroupsAvailable = Grupos LDAP common_title_mashup = Mashup common_title_members_reporting = Relat\u00F3rio de Membros common_title_message = Mensagem @@ -233,6 +238,8 @@ common_title_platform_total = Total de Plataformas ##common_title_plugin = Plugin common_title_port = Porta common_title_providers = Provedores +##common_title_queryPagesParsed = Grupos LDAP +##common_title_queryProgress = Grupos LDAP common_title_recent_alerts = Alertas Recentes common_title_recent_bundle_deployments = Deployments de Bundle recente common_title_recent_configuration_updates = Configura\u00E7\u00F5es Alteradas Recentemente @@ -272,6 +279,7 @@ common_title_sort_order_tooltip = Define a ordem dos resultados. common_title_start = Iniciar common_title_status = Status common_title_stop = Parar +##common_title_suggest = Sum\u00E1rio common_title_summary = Sum\u00E1rio common_title_tag_cloud = Nuvem de Tags common_title_the = O @@ -505,12 +513,22 @@ view_adminRoles_assignedGroups = Grupos de Recursos Associados view_adminRoles_assignedSubjects = Perfis Associados ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name. view_adminRoles_failLdap = Falha ao determinar se o LDAP foi configurado - assumindo como LDAP n\u00E3o configurado. +##view_adminRoles_failLdapAvailableGroups = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failLdapGroups = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failLdapGroupsRole = Falha ao carregar grupos do LDAP dispon\u00EDveis para o perfil. +##view_adminRoles_failLdapGroupsSettings = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos. view_adminRoles_failRoles = Falha ao recuperar perfis. view_adminRoles_globalPerms = Permiss\u00F5es Globais view_adminRoles_ldapGroups = Grupos LDAP view_adminRoles_ldapGroupsReadOnly = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapGroupsSettingsReadOnly = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapQueryPageSize = Permiss\u00F5es do Recurso +##view_adminRoles_ldapTooManyResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapTookLongResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapTookManyPagesResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapWarnParsingManyPagesResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapWarnQueryTakingLongResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura +##view_adminRoles_ldapWarnTooManyResults = Informa\u00E7\u00F5es do grupo LDAP com permiss\u00F5es apenas de leitura view_adminRoles_noLdap = A integra\u00E7\u00E3o com o LDAP ainda n\u00E3o foi configurada. Para configurar o LDAP acesse <a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Permiss\u00E3o CONFIGURE_WRITE desmarcada automaticamente devida a aus\u00EAncia da permiss\u00E3o CONFIGURE_READ... view_adminRoles_permissions_autoselecting_configureWrite_implied = Permiss\u00E3o CONFIGURE_READ marcada automaticamente devida a marca\u00E7\u00E3o de CONFIGURE_WRITE... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 4fbef12..3035f91 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2252,11 +2252,13 @@ common_msg_noItemsToShow = Отсутствуют элементы для ото common_msg_notYetImplemented = Еще не реализовано common_msg_see_more = подробнее... common_msg_step_x_of_y = Шаг {0} из {1} +##common_msg_typeToFilterResults = Еще не реализовано common_severity_debug = Отладка common_severity_error = Ошибка common_severity_fatal = Фатальный common_severity_info = Информация common_severity_warn = Предупреждение +##common_status_attention = Успешный common_status_canceled = Отменён common_status_deferred = Отложенный common_status_failed = Безуспешно @@ -2312,6 +2314,7 @@ common_title_group = Группа common_title_group_def_total = Определение количества групп common_title_group_member_health = Состояние члена группы common_title_groups = Группы +##common_title_groupsFound = Группы common_title_help = Помощь common_title_host = Host common_title_id = ID @@ -2323,6 +2326,7 @@ common_title_inventorySummary = Итог инвентаризации common_title_lastUpdated = Последнее обновление common_title_lastUpdatedBy = Последнее обновление от common_title_ldapGroups = LDAP-группы +##common_title_ldapGroupsAvailable = LDAP-группы common_title_mashup = Mashup common_title_members_reporting = Количество пользователей отчетности common_title_message = Сообщение @@ -2346,6 +2350,8 @@ common_title_platform_total = Количество платформ common_title_plugin = Плагин common_title_port = Порт common_title_providers = Провайдеры +##common_title_queryPagesParsed = LDAP-группы +##common_title_queryProgress = LDAP-группы common_title_recent_alerts = Последние предупреждения common_title_recent_bundle_deployments = Последние развертывания пакета common_title_recent_configuration_updates = Последние обновления конфигурации @@ -2382,6 +2388,7 @@ common_title_sort_order_tooltip = Установить порядок сорти common_title_start = Старт common_title_status = Статус common_title_stop = Стоп +##common_title_suggest = Сводка common_title_summary = Сводка common_title_tag_cloud = Облако тегов common_title_timestamp = Дата/Времяcommon_title_total=Итог @@ -2587,13 +2594,23 @@ view_adminRoles_assignedGroups = Назначенные группы ресур view_adminRoles_assignedSubjects = Назначенные субъекты ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name. view_adminRoles_failLdap = Не удалось определить, настроен ли LDAP - предположительно LDAP отсутствует. +##view_adminRoles_failLdapAvailableGroups = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failLdapGroups = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failLdapGroupsRole = Не удалось загрузить LDAP группы, доступные для роли. +##view_adminRoles_failLdapGroupsSettings = Не удалось получить LDAP-группы. Предположительно LDAP группы отсутствуют view_adminRoles_failRoles = Не удалось получить роли. view_adminRoles_globalPerms = Глобальные полномочия view_adminRoles_ldapGroups = LDAP-группы view_adminRoles_ldapGroupsReadOnly = данные LDAP групп доступны только для чтения ##view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. +##view_adminRoles_ldapGroupsSettingsReadOnly = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapQueryPageSize = Полномочия ресурса +##view_adminRoles_ldapTooManyResults = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapTookLongResults = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapTookManyPagesResults = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapWarnParsingManyPagesResults = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapWarnQueryTakingLongResults = данные LDAP групп доступны только для чтения +##view_adminRoles_ldapWarnTooManyResults = данные LDAP групп доступны только для чтения view_adminRoles_permissions_autoselecting_configureRead_implied = Автоматически отключено CONFIGURE_WRITE полномочие, поскольку отсутствует CONFIGURE_READ... view_adminRoles_permissions_autoselecting_configureWrite_implied = Автоматически выбрано CONFIGURE_READ полномочие, поскольку CONFIGURE_WRITE подразумевает, что ... ##view_adminRoles_permissions_autoselecting_manageBundleGroups_implied = Autoselected View Bundles, which is granted by Manage Bundle Groups... diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 24ea681..615d3a0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -135,11 +135,13 @@ common_msg_noItemsToShow = \u6ca1\u6709\u6761\u76ee\u663e\u793a common_msg_notYetImplemented = \u5c1a\u672a\u5b9e\u73b0 common_msg_see_more = \u67e5\u770b\u66f4\u591a... common_msg_step_x_of_y = Step {0} of {1} +##common_msg_typeToFilterResults = \u5c1a\u672a\u5b9e\u73b0 common_severity_debug = \u8c03\u8bd5 common_severity_error = Error common_severity_fatal = \u4e25\u91cd common_severity_info = \u4fe1\u606f common_severity_warn = \u8b66\u544a +##common_status_attention = \u6210\u529f common_status_canceled = \u53d6\u6d88 common_status_deferred = \u5ef6\u671f common_status_failed = \u5931\u8d25 @@ -195,6 +197,7 @@ common_title_group = \u7ec4 common_title_group_def_total = \u5b9a\u4e49\u7ec4\u603b\u6570 common_title_group_member_health = \u7ec4\u5458\u5065\u5eb7\u5ea6 common_title_groups = \u7ec4 +##common_title_groupsFound = \u7ec4 common_title_help = \u5e2e\u52a9 common_title_host = \u4e3b\u673a common_title_id = ID @@ -206,6 +209,7 @@ common_title_inventorySummary = \u6e05\u5355\u6c47\u603b common_title_lastUpdated = \u6700\u8fd1\u66f4\u65b0 common_title_lastUpdatedBy = \u6700\u8fd1\u66f4\u65b0\u8005 common_title_ldapGroups = LDAP\u7ec4 +##common_title_ldapGroupsAvailable = LDAP\u7ec4 common_title_mashup = Mashup common_title_members_reporting = \u7ec4\u62a5\u8868 common_title_message = \u6d88\u606f @@ -230,6 +234,8 @@ common_title_platform_total = \u6240\u6709\u5e73\u53f0 common_title_plugin = \u63d2\u4ef6 common_title_port = \u7aef\u53e3 common_title_providers = \u63d0\u4f9b\u8005 +##common_title_queryPagesParsed = LDAP\u7ec4 +##common_title_queryProgress = LDAP\u7ec4 common_title_recent_alerts = \u6700\u8fd1\u544a\u8b66 common_title_recent_bundle_deployments = \u6700\u8fd1\u53d1\u5e03Bundles common_title_recent_configuration_updates = \u6700\u8fd1\u914d\u7f6e\u66f4\u65b0 @@ -269,6 +275,7 @@ common_title_sort_order_tooltip = \u8bbe\u7f6e\u6392\u5e8f\u65b9\u5f0f. common_title_start = \u5f00\u59cb common_title_status = \u72b6\u6001 common_title_stop = \u505c\u6b62 +##common_title_suggest = \u7edf\u8ba1 common_title_summary = \u7edf\u8ba1 common_title_tag_cloud = \u6807\u7b7e\u4e91 common_title_the = The @@ -494,12 +501,22 @@ view_adminRoles_assignedGroups = \u5206\u914d\u7684\u8d44\u6e90\u7ec4 view_adminRoles_assignedSubjects = \u5206\u914d\u7684\u4e3b\u9898 ##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name. view_adminRoles_failLdap = \u65e0\u6cd5\u786e\u5b9aLDAP - \u5047\u5b9a\u6ca1\u6709LDAP. +##view_adminRoles_failLdapAvailableGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failLdapGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failLdapGroupsRole = \u52a0\u8f7dLDAP\u7ec4\u89d2\u8272\u5931\u8d25. +##view_adminRoles_failLdapGroupsSettings = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. view_adminRoles_failRoles = \u53d6\u5f97\u89d2\u8272\u5931\u8d25. view_adminRoles_globalPerms = \u5168\u5c40\u6388\u6743 view_adminRoles_ldapGroups = LDAP\u7ec4 view_adminRoles_ldapGroupsReadOnly = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapGroupsSettingsReadOnly = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapQueryPageSize = \u8d44\u6e90\u6388\u6743 +##view_adminRoles_ldapTooManyResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapTookLongResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapTookManyPagesResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapWarnParsingManyPagesResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapWarnQueryTakingLongResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +##view_adminRoles_ldapWarnTooManyResults = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb view_adminRoles_noLdap = \u6ca1\u6709\u96c6\u6210LDAP\u5b89\u5168, \u5230<a {0}>{1}</a>. ##view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... ##view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... commit 993910de8445769b88413362a87257e0f0b3eea4 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Fri Aug 9 10:22:37 2013 -0400 [BZ 990576] - insert hard ldap group limit with parsing to guard against excessive ui perf issues. - fix ldap search filter issue - add Suggest/Advice component for more feedback for ldap integration. - disable edit on Suggest/Advice component - clean up selector feedback ui threads to guard against refresh. - refresh cached ldap results after 30 mins. - modify AbstractSelector to better support overriding the availableFilterForm diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java index b17961d..8d53b82 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java @@ -36,11 +36,18 @@ import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.types.TitleOrientation; import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.events.ItemChangedEvent; +import com.smartgwt.client.widgets.form.events.ItemChangedHandler; import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.SpacerItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; +import com.smartgwt.client.widgets.form.fields.TextAreaItem; import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.layout.HLayout; @@ -63,7 +70,9 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public static final String FIELD_ID = "id"; public static final String FIELD_NAME = "name"; public static final String FIELD_DESCRIPTION = "description"; - private static boolean queryCompleted = false; + final TextItem searchTextItem = new TextItem(); + protected int cursorPosition; + private static int retryAttempt = 0; //override the selector key for ldap group selection. protected String getSelectorKey() { @@ -86,7 +95,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c availableFilterForm.setNumCols(2); } int groupPanelWidth = 375; - int groupPanelHeight = 140; + int groupPanelHeight = 150; // final TextItem search = new TextItem("search", // MSG.common_title_search()); @@ -100,6 +109,25 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c availableGroupDetails.setGroupTitle("Available Groups Results"); availableGroupDetails.setIsGroup(true); availableGroupDetails.setWrapItemTitles(false); + //add itemChanged handler to listen for changes to SearchItem + availableGroupDetails.addItemChangedHandler(new ItemChangedHandler() { + public void onItemChanged(ItemChangedEvent itemChangedEvent) { + + latestCriteria = getLatestCriteria(null); + + Timer timer = new Timer() { + @Override + public void run() { + if (latestCriteria != null) { + Criteria criteria = latestCriteria; + latestCriteria = null; + populateAvailableGrid(criteria); + } + } + }; + timer.schedule(500); + } + }); } final TextItem resultCountItem = new TextItem("resultCount", "Groups Found"); { @@ -111,23 +139,49 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c pageCountItem.setCanEdit(false); pageCountItem.setWidth("100%"); } + final TextAreaItem adviceItem = new TextAreaItem("advice", "Suggest"); + { + adviceItem.setWidth("100%"); + adviceItem.setHeight(20); + String feedback = "(None)"; + adviceItem.setValue(feedback); + adviceItem.setTooltip(feedback); + adviceItem.setDisabled(true); + adviceItem.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent event) { + event.cancel(); + cursorPosition = adviceItem.getSelectionRange()[0]; + } + }); + adviceItem.addChangedHandler(new ChangedHandler() { + + @Override + public void onChanged(ChangedEvent event) { + adviceItem.setSelectionRange(cursorPosition, cursorPosition); + } + }); + } // final TextItem search = new TextItem("search", // MSG.common_title_search()); - final TextItem search = new TextItem("search", "Search[within results]"); { - search.setWidth("100%"); - search.setTooltip("Start typing here to show groups containing the typed characters."); + searchTextItem.setName("search"); + searchTextItem.setTitle("Filter[results below]"); + searchTextItem.setWidth("100%"); + searchTextItem.setTooltip("Start typing here to only show groups containing the typed characters."); } final FormItemIcon loadingIcon = new FormItemIcon(); final FormItemIcon successIcon = new FormItemIcon(); final FormItemIcon failIcon = new FormItemIcon(); + final FormItemIcon attentionIcon = new FormItemIcon(); String successIconPath = "[SKIN]/actions/ok.png"; String failedIconPath = "[SKIN]/actions/exclamation.png"; String loadingIconPath = "[SKIN]/loading.gif"; - //icon.setSrc("[SKIN]/actions/help.png"); + String attentionIconPath = "[SKIN]/Dialog/warn.png"; loadingIcon.setSrc(loadingIconPath); successIcon.setSrc(successIconPath); failIcon.setSrc(failedIconPath); + attentionIcon.setSrc(attentionIconPath); final StaticTextItem groupQueryStatus = new StaticTextItem(); { @@ -136,7 +190,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c groupQueryStatus.setDefaultValue("Loading..."); groupQueryStatus.setIcons(loadingIcon); } - availableGroupDetails.setItems(resultCountItem, pageCountItem, groupQueryStatus, new SpacerItem(), search); + availableGroupDetails.setItems(resultCountItem, pageCountItem, groupQueryStatus, adviceItem, searchTextItem); // Ldap Group Settings region final DynamicForm ldapGroupSettings = new DynamicForm(); @@ -182,8 +236,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c //You have to set this attribute groupUsePosixGroupsItem.setAttribute("labelAsTitle", true); } - ldapGroupSettings - .setItems(groupSearch, groupMember, groupQueryPagingItem, groupQueryPagingCountItem, groupUsePosixGroupsItem); + ldapGroupSettings.setItems(groupSearch, groupMember, groupQueryPagingItem, groupQueryPagingCountItem, + groupUsePosixGroupsItem); // orient both panels next to each other HLayout panel = new HLayout(); @@ -196,6 +250,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c } availableFilterForm.addChild(panel); + final long ldapGroupSelectorRequestId = System.currentTimeMillis(); + //launch operations to populate/refresh LDAP Group Query contents. final Timer ldapPropertiesTimer = new Timer() { public void run() { @@ -230,75 +286,119 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c } } }; - ldapPropertiesTimer.scheduleRepeating(2000); // repeat interval in milliseconds, e.g. 30000 = 30seconds + ldapPropertiesTimer.schedule(2000); // repeat interval in milliseconds, e.g. 30000 = 30seconds //launch operations to populate/refresh LDAP Group Query contents. final Timer availableGroupsTimer = new Timer() { public void run() { - if (!queryCompleted) { - //make request to RHQ about state of latest LDAP GWT request - GWTServiceLookup.getLdapService().findAvailableGroupsStatus( - new AsyncCallback<Set<Map<String, String>>>() { - @Override - public void onFailure(Throwable caught) { - groupQueryStatus.setIcons(failIcon); - groupQueryStatus - .setDefaultValue("Fail: Unable to retrieve status for latest AvailableGroups() call."); - //TODO: update this message - CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + final String attention = "Attention"; + final String success = "Success"; + final String none = "(None)"; + final String failed = "Failed"; + //make request to RHQ about state of latest LDAP GWT request + GWTServiceLookup.getLdapService().findAvailableGroupsStatus( + new AsyncCallback<Set<Map<String, String>>>() { + @Override + public void onFailure(Throwable caught) { + groupQueryStatus.setIcons(failIcon); + groupQueryStatus.setDefaultValue(failed); + String adviceValue = "Failed: Unable to retrieve status for latest AvailableGroups() call."; + adviceItem.setValue(adviceValue); + adviceItem.setTooltip(adviceValue); + //TODO: update this message + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + retryAttempt++; + if (retryAttempt > 3) { + cancel();//kill thread + retryAttempt = 0; } + } - @Override - public void onSuccess(Set<Map<String, String>> results) { - // Log.debug("@@@@@@@ findAvailableGroupsStatus: SUCCESS:" + System.currentTimeMillis() - // + ":count:" - // + results.size()); - long start = -1, end = -1; - int pageCount = 0; - int resultCountValue = 0; - for (Map<String, String> map : results) { - String key = map.keySet().toArray()[0] + ""; - if (key.equals("query.results.parsed")) { - String value = map.get(key); - resultCountItem.setValue(value); - resultCountValue = Integer.valueOf(value); - } else if (key.equals("query.complete")) { - String value = map.get(key); - queryCompleted = Boolean.valueOf(value); - } else if (key.equals("query.start.time")) { - String value = map.get(key); - start = Long.valueOf(value); - } else if (key.equals("query.end.time")) { - String value = map.get(key); - end = Long.valueOf(value); - } else if (key.equals("query.page.count")) { - String value = map.get(key); - pageCountItem.setValue(value); - pageCount = Integer.valueOf(value); - } + @Override + public void onSuccess(Set<Map<String, String>> results) { + long start = -1, current = -1; + int pageCount = 0; + int resultCountValue = 0; + boolean queryCompleted = false; + for (Map<String, String> map : results) { + String key = map.keySet().toArray()[0] + ""; + if (key.equals("query.results.parsed")) { + String value = map.get(key); + resultCountItem.setValue(value); + resultCountValue = Integer.valueOf(value); + } else if (key.equals("query.complete")) { + String value = map.get(key); + queryCompleted = Boolean.valueOf(value); + } else if (key.equals("query.start.time")) { + String value = map.get(key); + start = Long.valueOf(value); + } else if (key.equals("query.current.time")) { + String value = map.get(key); + current = Long.valueOf(value); + } else if (key.equals("query.page.count")) { + String value = map.get(key); + pageCountItem.setValue(value); + pageCount = Integer.valueOf(value); } - //act on status details to add extra perf suggestions - if (queryCompleted) { + } + //Update status information + String warnTooManyResults = " A lot of results are being returned. Modify your 'Group Search Filter' to return fewer results."; + String warnQueryTakingLongResults = " Query taking a while to complete. Modify your 'Group Search Filter' to return fewer results."; + String warnParsingManyPagesResults = " Query requires a lot of pages. Modify your 'Group Search Page Size' to return more results per request."; + boolean resultCountWarning = false; + boolean pageCountWarning = false; + boolean timePassingWarning = false; + if ((resultCountWarning = (resultCountValue > 5000)) + || (pageCountWarning = (pageCount > 5)) + || (timePassingWarning = (current - start) > 5 * 1000)) { + adviceItem.setDisabled(false); + groupQueryStatus.setIcons(attentionIcon); + if (resultCountWarning) { + adviceItem.setValue(warnTooManyResults); + adviceItem.setTooltip(warnTooManyResults); + } else if (pageCountWarning) { + adviceItem.setValue(warnParsingManyPagesResults); + adviceItem.setTooltip(warnParsingManyPagesResults); + } else if (timePassingWarning) { + adviceItem.setValue(warnQueryTakingLongResults); + adviceItem.setTooltip(warnQueryTakingLongResults); + } + } + + //act on status details to add extra perf suggestions. Kill threads older than 30 mins + long parseTime = System.currentTimeMillis() - ldapGroupSelectorRequestId; + if ((queryCompleted) || (parseTime) > 30 * 60 * 1000) { + String tooManyResults = "Too many results to show all. Modify your 'Group Search Filter' to return fewer than 20000 results."; + String queryTookLongResults = " Query took " + parseTime + + " ms to complete. Modify your 'Group Search Filter' to return fewer results."; + String queryTookManyPagesResults = " Query required " + + pageCount + + " pages to complete. Modify 'Group Search Page Size' to return more results per request."; + adviceItem.setDisabled(false); + groupQueryStatus.setIcons(attentionIcon); + groupQueryStatus.setDefaultValue(attention); + if (resultCountValue > 20000) {//results throttled + adviceItem.setValue(tooManyResults); + adviceItem.setTooltip(tooManyResults); + } else if ((current - start) >= 10 * 1000) {// took longer than 10s + adviceItem.setValue(queryTookLongResults); + adviceItem.setTooltip(queryTookLongResults); + } else if (pageCount >= 20) {// required more than 20 pages of results + adviceItem.setValue(queryTookManyPagesResults); + adviceItem.setTooltip(queryTookManyPagesResults); + } else {//simple success. + groupQueryStatus.setDefaultValue(success); groupQueryStatus.setIcons(successIcon); - String success = "Success"; - String tooManyResults = success + ": Too many results."; - String queryTookLongResults = success + ": Query took long to complete."; - String queryTookManyPagesResults = success + ": Query required a lot of paging."; - //TODO: add in extra information about results. - if (resultCountValue > 20000) {//results throttled - groupQueryStatus.setDefaultValue(tooManyResults); - } else if ((end - start) >= 10 * 1000) {// took longer than 10s - groupQueryStatus.setDefaultValue(queryTookLongResults); - } else if (pageCount >= 20) {// took longer than 10s - groupQueryStatus.setDefaultValue(queryTookManyPagesResults); - } + adviceItem.setValue(none); + adviceItem.setTooltip(none); + adviceItem.setDisabled(true); } - availableGroupDetails.markForRedraw(); //now cancel the timer cancel(); } - }); - } + availableGroupDetails.markForRedraw(); + } + }); } }; availableGroupsTimer.scheduleRepeating(3000); // repeat interval in milliseconds, e.g. 30000 = 30seconds @@ -315,7 +415,9 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c */ @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { - String search = (String) availableFilterForm.getValue("search"); + //String search = (String) availableFilterForm.getValue("search"); + //non-trivial recursive form items possible. Retrieve from correct form item. + String search = searchTextItem.getValueAsString(); Criteria criteria = new Criteria(); if (null != search) { criteria.addCriteria("name", search); @@ -330,9 +432,10 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public static class LdapGroupsDataSource extends RPCDataSource<LdapGroup, org.rhq.core.domain.criteria.Criteria> { - //cache ldap group data from external server + //cache ldap group data from external server for 30 mins then stale. private Set<Map<String, String>> cachedLdapGroupsAvailable; private Map<String, Map<String, String>> cachedNameKeyedMap; + private long cachedLdapGroupsLast = -1; public LdapGroupsDataSource() { DataSourceTextField nameField = new DataSourceTextField(FIELD_NAME, FIELD_NAME); @@ -368,8 +471,9 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c @Override protected void executeFetch(final DSRequest request, final DSResponse response, final org.rhq.core.domain.criteria.Criteria unused) { - //if not null then go through to initialize - if (cachedLdapGroupsAvailable == null) { + //if not null or stale then go through to initialize|reset + if ((cachedLdapGroupsAvailable == null) + || ((System.currentTimeMillis() - cachedLdapGroupsLast) > 30 * 60 * 1000)) { fetchLdapGroupsFromServerAsync(request, response); } else {//use cached data and return correct response //process cachedLdapGroupsAvailable based on criteria @@ -422,6 +526,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public void onSuccess(Set<Map<String, String>> locatedGroupMaps) { Log.debug("Successfully located " + locatedGroupMaps.size() + " available LDAP groups."); cachedLdapGroupsAvailable = locatedGroupMaps; + cachedLdapGroupsLast = System.currentTimeMillis(); //all groups displayed initially PageList<LdapGroup> ldapGroups = convertToPageList(locatedGroupMaps); sendSuccessResponse(request, response, ldapGroups); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 12c5eb0..6f09142 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -65,9 +65,9 @@ import com.smartgwt.client.widgets.layout.VStack; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedUtility; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVStack; -import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedUtility; /** * @author Greg Hinkle @@ -344,7 +344,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria return availableSectionStack; } - private void populateAvailableGrid(Criteria criteria) { + protected void populateAvailableGrid(Criteria criteria) { // TODO until http://code.google.com/p/smartgwt/issues/detail?id=490 is fixed always go to the server for data this.datasource.invalidateCache(); DSRequest requestProperties = new DSRequest(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 67abb77..dc53a3c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -96,14 +96,15 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { private static boolean groupQueryComplete = false; private static int groupQueryResultCount = 0; private static long groupQueryStartTime = -1; - private static long groupQueryEndTime = -1; + private static long groupQueryCurrentTime = -1; private static int groupQueryPageCount = 0; + private static final int LDAP_GROUP_QUERY_LIMIT = 20000;//start to see a lot of ui responsiveness issues beyond this. private void resetGroupQueryDetails() { groupQueryComplete = false; groupQueryResultCount = 0; groupQueryStartTime = -1; - groupQueryEndTime = -1; + groupQueryCurrentTime = -1; groupQueryPageCount = 0; } public Set<Map<String, String>> findAvailableGroups() { @@ -138,8 +139,8 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { availableGroupsQueryStatus.add(buildStatusEntry("query.results.parsed", String.valueOf(groupQueryResultCount))); //query.start.time => timestamp availableGroupsQueryStatus.add(buildStatusEntry("query.start.time", String.valueOf(groupQueryStartTime))); - //query.end.time => timestamp|-1 - availableGroupsQueryStatus.add(buildStatusEntry("query.end.time", String.valueOf(groupQueryEndTime))); + //query.current.time => timestamp|-1 + availableGroupsQueryStatus.add(buildStatusEntry("query.current.time", String.valueOf(groupQueryCurrentTime))); //query.page.count => 0...N availableGroupsQueryStatus.add(buildStatusEntry("query.page.count", String.valueOf(groupQueryPageCount))); @@ -470,8 +471,11 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" int passedInPageSize = -1; try { passedInPageSize = Integer.valueOf(groupPageSize.trim()); - if (passedInPageSize > 0) { + if ((passedInPageSize > 0) && (passedInPageSize <= LDAP_GROUP_QUERY_LIMIT)) { defaultPageSize = passedInPageSize; + } else {//keep defaults and log actual value being used. + log.debug("LDAP Group Page Size passed '" + groupPageSize + + "' was ignored. Defaulting to 1000."); } } catch (NumberFormatException nfe) { //log issue and do nothing. Go with the default. @@ -494,6 +498,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" //update queryResultCount groupQueryResultCount = groupDetailsMap.size(); + groupQueryCurrentTime = System.currentTimeMillis(); // continually parsing pages of results until we're done. // only if they're enabled in the UI. @@ -511,7 +516,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } //continually parsing pages of results until we're done. - while (cookie != null) { + while ((groupQueryResultCount <= LDAP_GROUP_QUERY_LIMIT) && (cookie != null)) { //ensure the next requests contains the session/cookie details ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, Control.CRITICAL) }); @@ -520,19 +525,21 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" //update Query state after each page groupQueryResultCount = groupDetailsMap.size(); groupQueryPageCount++; + groupQueryCurrentTime = System.currentTimeMillis(); //empty out cookie cookie = null; - //test for further iterations - controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); + //insert group query throttle. + //test for further iterations + controls = ctx.getResponseControls(); + if (controls != null) { + for (Control control : controls) { + if (control instanceof PagedResultsResponseControl) { + PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; + cookie = pagedResult.getCookie(); + } } } - } } } } @@ -553,7 +560,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" throw new LdapCommunicationException(iex); } //update end of query information - groupQueryEndTime = System.currentTimeMillis(); + groupQueryCurrentTime = System.currentTimeMillis(); groupQueryComplete = true; return groupDetailsMap; } @@ -575,7 +582,9 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" //execute search based on controls and context passed in. NamingEnumeration<SearchResult> answer = ctx.search(baseDNs[x], filter, searchControls); boolean ldapApiEnumerationBugEncountered = false; - while ((!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change + int resultCount = 0; + while ((resultCount <= LDAP_GROUP_QUERY_LIMIT) && (groupDetailsMap.size() <= LDAP_GROUP_QUERY_LIMIT) + && (!ldapApiEnumerationBugEncountered) && answer.hasMoreElements()) {//BZ:582471- ldap api bug change // We use the first match SearchResult si = null; try { @@ -595,6 +604,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" entry.put("name", name); entry.put("description", description); groupDetailsMap.add(entry); + resultCount++; } } commit cccb252d70b88922088e1f5e614ec9deb34f1e45 Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com> Date: Tue Aug 6 14:36:55 2013 -0400 [BZ 990576] Add messaging and updates around ldap query performance for adminstrator. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java index 4f763ff..b17961d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java @@ -27,17 +27,25 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.types.TitleOrientation; import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.CheckboxItem; +import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.SpacerItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.layout.HLayout; +import org.rhq.core.domain.common.composite.SystemSetting; +import org.rhq.core.domain.common.composite.SystemSettings; import org.rhq.core.domain.resource.group.LdapGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -55,6 +63,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c public static final String FIELD_ID = "id"; public static final String FIELD_NAME = "name"; public static final String FIELD_DESCRIPTION = "description"; + private static boolean queryCompleted = false; //override the selector key for ldap group selection. protected String getSelectorKey() { @@ -72,11 +81,227 @@ public class RoleLdapGroupSelector extends AbstractSelector<LdapGroup, org.rhq.c @Override protected DynamicForm getAvailableFilterForm() { DynamicForm availableFilterForm = new DynamicForm(); - availableFilterForm.setWidth100(); - availableFilterForm.setNumCols(2); - - final TextItem search = new TextItem("search", MSG.common_title_search()); - availableFilterForm.setItems(search, new SpacerItem()); + { + availableFilterForm.setWidth100(); + availableFilterForm.setNumCols(2); + } + int groupPanelWidth = 375; + int groupPanelHeight = 140; + + // final TextItem search = new TextItem("search", + // MSG.common_title_search()); + + // Structure the display area into two separate display regions + // Available Groups region + final DynamicForm availableGroupDetails = new DynamicForm(); + { + availableGroupDetails.setWidth(groupPanelWidth); + availableGroupDetails.setHeight(groupPanelHeight); + availableGroupDetails.setGroupTitle("Available Groups Results"); + availableGroupDetails.setIsGroup(true); + availableGroupDetails.setWrapItemTitles(false); + } + final TextItem resultCountItem = new TextItem("resultCount", "Groups Found"); + { + resultCountItem.setCanEdit(false); + resultCountItem.setWidth("100%"); + } + final TextItem pageCountItem = new TextItem("pageCount", "Query Pages Parsed"); + { + pageCountItem.setCanEdit(false); + pageCountItem.setWidth("100%"); + } + // final TextItem search = new TextItem("search", + // MSG.common_title_search()); + final TextItem search = new TextItem("search", "Search[within results]"); + { + search.setWidth("100%"); + search.setTooltip("Start typing here to show groups containing the typed characters."); + } + final FormItemIcon loadingIcon = new FormItemIcon(); + final FormItemIcon successIcon = new FormItemIcon(); + final FormItemIcon failIcon = new FormItemIcon(); + String successIconPath = "[SKIN]/actions/ok.png"; + String failedIconPath = "[SKIN]/actions/exclamation.png"; + String loadingIconPath = "[SKIN]/loading.gif"; + //icon.setSrc("[SKIN]/actions/help.png"); + loadingIcon.setSrc(loadingIconPath); + successIcon.setSrc(successIconPath); + failIcon.setSrc(failedIconPath); + + final StaticTextItem groupQueryStatus = new StaticTextItem(); + { + groupQueryStatus.setName("groupQueryStatus"); + groupQueryStatus.setTitle("Query Progress"); + groupQueryStatus.setDefaultValue("Loading..."); + groupQueryStatus.setIcons(loadingIcon); + } + availableGroupDetails.setItems(resultCountItem, pageCountItem, groupQueryStatus, new SpacerItem(), search); + + // Ldap Group Settings region + final DynamicForm ldapGroupSettings = new DynamicForm(); + { + ldapGroupSettings.setWidth(groupPanelWidth); + ldapGroupSettings.setHeight(groupPanelHeight); + ldapGroupSettings.setGroupTitle("[Read Only] Ldap Group Settings. Edit in 'System Settings'"); + ldapGroupSettings.setIsGroup(true); + ldapGroupSettings.setWrapItemTitles(false); + } + final TextItem groupSearch = new TextItem("groupSearch", "Search Filter"); + { + groupSearch.setCanEdit(false); + groupSearch.setWidth("100%"); + } + final TextItem groupMember = new TextItem("groupMember", "Member Filter"); + { + groupMember.setCanEdit(false); + groupMember.setWidth("100%"); + } + final CheckboxItem groupQueryPagingItem = new CheckboxItem("groupQueryEnable", "Query Paging Enabled"); + { + groupQueryPagingItem.setCanEdit(false); + groupQueryPagingItem.setValue(false); + groupQueryPagingItem.setShowLabel(false); + groupQueryPagingItem.setShowTitle(true); + groupQueryPagingItem.setTitleOrientation(TitleOrientation.LEFT); + //You have to set this attribute + groupQueryPagingItem.setAttribute("labelAsTitle", true); + } + final TextItem groupQueryPagingCountItem = new TextItem("groupQueryCount", "Query Page Size"); + { + groupQueryPagingCountItem.setCanEdit(false); + groupQueryPagingCountItem.setWidth("100%"); + } + final CheckboxItem groupUsePosixGroupsItem = new CheckboxItem("groupUsePosixGroups", "Use Posix Enabled"); + { + groupUsePosixGroupsItem.setCanEdit(false); + groupUsePosixGroupsItem.setValue(false); + groupUsePosixGroupsItem.setShowLabel(false); + groupUsePosixGroupsItem.setShowTitle(true); + groupUsePosixGroupsItem.setTitleOrientation(TitleOrientation.LEFT); + //You have to set this attribute + groupUsePosixGroupsItem.setAttribute("labelAsTitle", true); + } + ldapGroupSettings + .setItems(groupSearch, groupMember, groupQueryPagingItem, groupQueryPagingCountItem, groupUsePosixGroupsItem); + + // orient both panels next to each other + HLayout panel = new HLayout(); + { + panel.addMember(availableGroupDetails); + DynamicForm spacerWrapper = new DynamicForm(); + spacerWrapper.setItems(new SpacerItem()); + panel.addMember(spacerWrapper); + panel.addMember(ldapGroupSettings); + } + availableFilterForm.addChild(panel); + + //launch operations to populate/refresh LDAP Group Query contents. + final Timer ldapPropertiesTimer = new Timer() { + public void run() { + //if system properties not set, launch request/update + String ldapGroupQuery = groupSearch.getValueAsString(); + if ((ldapGroupQuery == null) || (ldapGroupQuery.trim().isEmpty())) { + GWTServiceLookup.getSystemService().getSystemSettings(new AsyncCallback<SystemSettings>() { + @Override + public void onFailure(Throwable caught) { + groupQueryStatus.setIcons(failIcon); + groupQueryStatus.setDefaultValue("Fail: Unable to retrieve system settings."); + //TODO: update this message + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + } + + @Override + public void onSuccess(SystemSettings settings) { + //retrieve relevant information once and update ui + String ldapGroupFilter = settings.get(SystemSetting.LDAP_GROUP_FILTER); + String ldapGroupMember = settings.get(SystemSetting.LDAP_GROUP_MEMBER); + String ldapGroupPagingEnabled = settings.get(SystemSetting.LDAP_GROUP_PAGING); + String ldapGroupPagingValue = settings.get(SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE); + String ldapGroupIsPosix = settings.get(SystemSetting.LDAP_GROUP_USE_POSIX); + groupSearch.setValue(ldapGroupFilter); + groupMember.setValue(ldapGroupMember); + groupQueryPagingItem.setValue(Boolean.valueOf(ldapGroupPagingEnabled)); + groupQueryPagingCountItem.setValue(ldapGroupPagingValue); + groupUsePosixGroupsItem.setValue(Boolean.valueOf(ldapGroupIsPosix)); + ldapGroupSettings.markForRedraw(); + } + }); + } + } + }; + ldapPropertiesTimer.scheduleRepeating(2000); // repeat interval in milliseconds, e.g. 30000 = 30seconds + + //launch operations to populate/refresh LDAP Group Query contents. + final Timer availableGroupsTimer = new Timer() { + public void run() { + if (!queryCompleted) { + //make request to RHQ about state of latest LDAP GWT request + GWTServiceLookup.getLdapService().findAvailableGroupsStatus( + new AsyncCallback<Set<Map<String, String>>>() { + @Override + public void onFailure(Throwable caught) { + groupQueryStatus.setIcons(failIcon); + groupQueryStatus + .setDefaultValue("Fail: Unable to retrieve status for latest AvailableGroups() call."); + //TODO: update this message + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); + } + + @Override + public void onSuccess(Set<Map<String, String>> results) { + // Log.debug("@@@@@@@ findAvailableGroupsStatus: SUCCESS:" + System.currentTimeMillis() + // + ":count:" + // + results.size()); + long start = -1, end = -1; + int pageCount = 0; + int resultCountValue = 0; + for (Map<String, String> map : results) { + String key = map.keySet().toArray()[0] + ""; + if (key.equals("query.results.parsed")) { + String value = map.get(key); + resultCountItem.setValue(value); + resultCountValue = Integer.valueOf(value); + } else if (key.equals("query.complete")) { + String value = map.get(key); + queryCompleted = Boolean.valueOf(value); + } else if (key.equals("query.start.time")) { + String value = map.get(key); + start = Long.valueOf(value); + } else if (key.equals("query.end.time")) { + String value = map.get(key); + end = Long.valueOf(value); + } else if (key.equals("query.page.count")) { + String value = map.get(key); + pageCountItem.setValue(value); + pageCount = Integer.valueOf(value); + } + } + //act on status details to add extra perf suggestions + if (queryCompleted) { + groupQueryStatus.setIcons(successIcon); + String success = "Success"; + String tooManyResults = success + ": Too many results."; + String queryTookLongResults = success + ": Query took long to complete."; + String queryTookManyPagesResults = success + ": Query required a lot of paging."; + //TODO: add in extra information about results. + if (resultCountValue > 20000) {//results throttled + groupQueryStatus.setDefaultValue(tooManyResults); + } else if ((end - start) >= 10 * 1000) {// took longer than 10s + groupQueryStatus.setDefaultValue(queryTookLongResults); + } else if (pageCount >= 20) {// took longer than 10s + groupQueryStatus.setDefaultValue(queryTookManyPagesResults); + } + } + availableGroupDetails.markForRedraw(); + //now cancel the timer + cancel(); + } + }); + } + } + }; + availableGroupsTimer.scheduleRepeating(3000); // repeat interval in milliseconds, e.g. 30000 = 30seconds return availableFilterForm; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java index 8356773..521556b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java @@ -42,6 +42,11 @@ public interface LdapGWTService extends RemoteService { Set<Map<String, String>> findAvailableGroups() throws RuntimeException; /** + * @return Map with status of last LDAP groups query available + */ + Set<Map<String, String>> findAvailableGroupsStatus() throws RuntimeException; + + /** * @return Map with LDAP details for user passed. */ Map<String, String> getLdapDetailsFor(String user) throws RuntimeException; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java index 3255b8f..28d9323 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java @@ -77,6 +77,28 @@ public class LdapGWTServiceImpl extends AbstractGWTServiceImpl implements LdapGW } } + @Override + public Set<Map<String, String>> findAvailableGroupsStatus() throws RuntimeException { + try { + //add permissions check + Set<Permission> globalPermissions = authorizationManager.getExplicitGlobalPermissions(getSessionSubject()); + Boolean accessGranted = globalPermissions.contains(Permission.MANAGE_SECURITY); + + Set<Map<String, String>> results = null; + if (accessGranted) { + results = ldapManager.findAvailableGroupsStatus(); + } else { + String message = "User '" + getSessionSubject().getName() + + "' does not have sufficient permissions to query the status of available LDAP groups request."; + log.debug(message); + throw new PermissionException(message); + } + return SerialUtility.prepare(results, "findAvailableGroups"); + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + public void setLdapGroupsForRole(int roleId, List<String> groupIds) throws RuntimeException { try { //add permissions check diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java index 8a0e321..67abb77 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java @@ -93,9 +93,24 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { @EJB private SystemManagerLocal systemManager; + private static boolean groupQueryComplete = false; + private static int groupQueryResultCount = 0; + private static long groupQueryStartTime = -1; + private static long groupQueryEndTime = -1; + private static int groupQueryPageCount = 0; + + private void resetGroupQueryDetails() { + groupQueryComplete = false; + groupQueryResultCount = 0; + groupQueryStartTime = -1; + groupQueryEndTime = -1; + groupQueryPageCount = 0; + } public Set<Map<String, String>> findAvailableGroups() { //load current system properties Properties systemConfig = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); + //reset group query details + resetGroupQueryDetails(); //retrieve the filters. String groupFilter = (String) systemConfig.get(SystemSetting.LDAP_GROUP_FILTER.name()); @@ -114,6 +129,29 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal { return emptyAvailableGroups; } + public Set<Map<String, String>> findAvailableGroupsStatus() { + Set<Map<String, String>> availableGroupsQueryStatus = new HashSet<Map<String, String>>(); + + //query.complete => true|false + availableGroupsQueryStatus.add(buildStatusEntry("query.complete", String.valueOf(groupQueryComplete))); + //query.results.parsed => 0...N + availableGroupsQueryStatus.add(buildStatusEntry("query.results.parsed", String.valueOf(groupQueryResultCount))); + //query.start.time => timestamp + availableGroupsQueryStatus.add(buildStatusEntry("query.start.time", String.valueOf(groupQueryStartTime))); + //query.end.time => timestamp|-1 + availableGroupsQueryStatus.add(buildStatusEntry("query.end.time", String.valueOf(groupQueryEndTime))); + //query.page.count => 0...N + availableGroupsQueryStatus.add(buildStatusEntry("query.page.count", String.valueOf(groupQueryPageCount))); + + return availableGroupsQueryStatus; + } + + private Map<String, String> buildStatusEntry(String key, String value) { + HashMap<String, String> status = new HashMap<String, String>(); + status.put(key, value); + return status; + } + public Set<String> findAvailableGroupsFor(String userName) { Properties options = populateProperties(systemManager.getSystemSettings(subjectManager.getOverlord())); String groupFilter = options.getProperty(SystemSetting.LDAP_GROUP_FILTER.name(), ""); @@ -449,8 +487,14 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" String[] baseDNs = baseDN.split(BASEDN_DELIMITER); for (int x = 0; x < baseDNs.length; x++) { + //update query start time + groupQueryStartTime = System.currentTimeMillis(); + executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + //update queryResultCount + groupQueryResultCount = groupDetailsMap.size(); + // continually parsing pages of results until we're done. // only if they're enabled in the UI. if (useQueryPaging) { @@ -472,6 +516,11 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, Control.CRITICAL) }); executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); + + //update Query state after each page + groupQueryResultCount = groupDetailsMap.size(); + groupQueryPageCount++; + //empty out cookie cookie = null; //test for further iterations @@ -484,25 +533,6 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" } } } - //continually parsing pages of results until we're done. - while (cookie != null) { - //ensure the next requests contains the session/cookie details - ctx.setRequestControls(new Control[] { new PagedResultsControl(defaultPageSize, cookie, - Control.CRITICAL) }); - executeGroupSearch(filter, groupDetailsMap, ctx, searchControls, baseDNs, x); - //empty out cookie - cookie = null; - //test for further iterations - controls = ctx.getResponseControls(); - if (controls != null) { - for (Control control : controls) { - if (control instanceof PagedResultsResponseControl) { - PagedResultsResponseControl pagedResult = (PagedResultsResponseControl) control; - cookie = pagedResult.getCookie(); - } - } - } - } } } } @@ -522,6 +552,9 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), "" log.error("Unexpected LDAP communciation error:" + iex.getMessage(), iex); throw new LdapCommunicationException(iex); } + //update end of query information + groupQueryEndTime = System.currentTimeMillis(); + groupQueryComplete = true; return groupDetailsMap; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java index 14945ce..fe3c392 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java @@ -51,6 +51,8 @@ public interface LdapGroupManagerLocal { Set<Map<String, String>> findAvailableGroups(); + Set<Map<String, String>> findAvailableGroupsStatus(); + Set<String> findAvailableGroupsFor(String userName); Map<String, String> findLdapUserDetails(String userName); commit 52bdb069fe9ac0c313f8269b8e264e09cdb0a4a4 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Tue Aug 13 15:21:28 2013 -0500 Update the schema manager to check for schema version at startup. The server should not start if there is schema disagreement. Also throw an exception during update if the installed schema is too advanced for existing installation. diff --git a/.classpath b/.classpath index cad0bdb..d590a22 100644 --- a/.classpath +++ b/.classpath @@ -380,7 +380,7 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-submit/1.5.2/byteman-submit-1.5.2-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2.jar" sourcepath="M2_REPO/org/jboss/byteman/byteman-bmunit/1.5.2/byteman-bmunit-1.5.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/cassandra/cassandra-all/1.2.4/cassandra-all-1.2.4.jar"/> - <classpathentry kind="var" path="M2_REPO/com/datastax/cassandra/cassandra-driver-core/1.0.0-rhq-1.2.4/cassandra-driver-core-1.0.0-rhq-1.2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/com/datastax/cassandra/cassandra-driver-core/1.0.2-rhq-1.2.4/cassandra-driver-core-1.0.2-rhq-1.2.4.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/thrift/libthrift/0.7.0/libthrift-0.7.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/12.0/guava-12.0.jar"/> @@ -392,5 +392,6 @@ <classpathentry exported="true" kind="var" path="JDK_HOME/jre/lib/rt.jar"/> <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/3.1.0.Final/jboss-vfs-3.1.0.Final.jar"/> <classpathentry kind="output" path="eclipse-classes"/> </classpath> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 8e3b44a..6fb2915 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -47,6 +47,13 @@ <artifactId>cassandra-driver-core</artifactId> <version>${cassandra.driver.version}</version> </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + <version>${jboss-vfs.version}</version> + </dependency> + </dependencies> <build> diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java index baf7c23..7b8c520 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java @@ -92,7 +92,7 @@ abstract class AbstractManager { } /** - * Init the Cassandra cluster session with the username and password provided + * Init the storage cluster session with the username and password provided * at creation. */ protected void initClusterSession() { @@ -100,7 +100,7 @@ abstract class AbstractManager { } /** - * Init the Cassandra cluster session with provided username and password. + * Init the storage cluster session with provided username and password. * * @param username * @param password @@ -125,7 +125,7 @@ abstract class AbstractManager { } /** - * Shutdown the Cassandra cluster connection. + * Shutdown the storage cluster connection. */ protected void shutdownClusterConnection() { log.info("Shutting down existing cluster connections"); @@ -135,7 +135,7 @@ abstract class AbstractManager { } /** - * Get cluster size. + * Get storage cluster size. * * @return cluster size */ @@ -158,7 +158,7 @@ abstract class AbstractManager { } /** - * Runs a CQL query to check the existence of the RHQ user + * Runs a CQL query to check the existence of the RHQ user on the storage cluster. * * @return true if the RHQ user exists, false otherwise */ @@ -173,7 +173,7 @@ abstract class AbstractManager { } /** - * Run a CQL query to check the existence of the RHQ schema + * Run a CQL query to check the existence of the RHQ schema. * * @return true if the RHQ schema exists, false otherwise */ @@ -192,11 +192,11 @@ abstract class AbstractManager { } /** - * Run a CQL query to retrieve the current RHQ schema version + * Run a CQL query to retrieve the installed storage schema version. * * @return current RHQ schema version */ - protected int getSchemaVersion() { + protected int getInstalledSchemaVersion() { int maxVersion = 0; try { ResultSet resultSet = executeManagementQuery(Query.VERSION); diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java index 8d28bfa..1a82779 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java @@ -80,7 +80,7 @@ public class SchemaManager { } /** - * Install and update the RHQ schema. + * Install and update the storage cluster schema. * * @throws Exception */ @@ -90,7 +90,18 @@ public class SchemaManager { } /** - * Drop RHQ schema and revert the database to pre-RHQ state. + * Check the existing storage cluster schema version to ensure it is compatible with the + * current installation. + * + * @throws Exception + */ + public void checkCompatibility() throws Exception { + VersionManager version = new VersionManager(username, password, nodes); + version.checkCompatibility(); + } + + /** + * Drop storage cluster schema and revert the storage cluster to pre-RHQ state. * * @throws Exception */ diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFolder.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFolder.java index 84cb515..31266ca 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFolder.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFolder.java @@ -30,6 +30,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.JarURLConnection; import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -41,6 +42,8 @@ import java.util.jar.JarFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.vfs.VirtualFile; + /** * @author Stefan Negrea */ @@ -83,6 +86,19 @@ class UpdateFolder { } /** + * The version represented by the latest/highest xml update file. + * + * @return the version + */ + public int getLatestVersion() { + if (this.updateFiles != null && this.updateFiles.size() > 0) { + return this.updateFiles.get(this.updateFiles.size() - 1).extractVersion(); + } + + return 0; + } + + /** * Loads the initial set of update files based on the input folder. * * @return list of update files @@ -115,9 +131,13 @@ class UpdateFolder { } } } else if (resourceFolderURL.getProtocol().equals("vfs")) { - // TODO need to add support for VFS if going to use inside EAP - throw new RuntimeException("The URL protocol [" + resourceFolderURL.getProtocol() + "] is not " + - "supported"); + URLConnection conn = resourceFolderURL.openConnection(); + VirtualFile virtualFolder = (VirtualFile)conn.getContent(); + for (VirtualFile virtualChild : virtualFolder.getChildren()) { + if (!virtualChild.isDirectory()) { + files.add(new UpdateFile(virtualChild.getPathNameRelativeTo(virtualFolder.getParent()))); + } + } } else { // In the event we get another protocol that we do not recognize, throw an // exception instead of failing silently. diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java index 794e991..ec54a0c 100644 --- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java @@ -34,6 +34,8 @@ import com.datastax.driver.core.exceptions.AuthenticationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.cassandra.schema.exception.InstalledSchemaTooAdvancedException; +import org.rhq.cassandra.schema.exception.InstalledSchemaTooOldException; import org.rhq.core.domain.cloud.StorageNode; /** @@ -73,14 +75,14 @@ class VersionManager extends AbstractManager { * @throws Exception */ public void install() throws Exception { - log.info("Preparing to install schema"); + log.info("Preparing to install storage schema"); boolean clusterSessionInitialized = false; try { initClusterSession(); clusterSessionInitialized = true; } catch (AuthenticationException e) { - log.debug("Authentication exception. Will now attempt to create the schema."); + log.debug("Authentication exception. Will now attempt to create the storage schema."); log.debug(e); } finally { shutdownClusterConnection(); @@ -119,7 +121,7 @@ class VersionManager extends AbstractManager { if (!schemaExists()) { execute(updateFolder.getUpdateFiles().get(0), properties); } else { - log.info("RHQ schema already exists."); + log.info("Storage schema already exists."); } } catch (Exception ex) { log.error(ex); @@ -147,28 +149,44 @@ class VersionManager extends AbstractManager { initClusterSession(); if (!schemaExists()) { - log.error("Schema not installed."); - throw new RuntimeException("Schema not installed propertly, cannot apply schema updates."); + log.error("Storage schema not installed."); + throw new RuntimeException("Storage schema not installed propertly, cannot apply schema updates."); } UpdateFolder updateFolder = new UpdateFolder(Task.Update.getFolder()); - int currentSchemaVersion = getSchemaVersion(); - log.info("Current schema version is " + currentSchemaVersion); - updateFolder.removeAppliedUpdates(currentSchemaVersion); + int installedSchemaVersion = getInstalledSchemaVersion(); + log.info("Installed storage schema version is " + installedSchemaVersion); - if (updateFolder.getUpdateFiles().size() == 0) { - log.info("RHQ schema is current! No updates applied."); + int requiredSchemaVersion = updateFolder.getLatestVersion(); + log.info("Required storage schema version is " + requiredSchemaVersion); + + if (requiredSchemaVersion == installedSchemaVersion) { + log.info("Storage schema version is current ( " + installedSchemaVersion + " ). No updates applied."); + } else if (requiredSchemaVersion < installedSchemaVersion) { + log.error("Installed storage cluster schema version: " + installedSchemaVersion + + ". Required schema version: " + requiredSchemaVersion + + ". Storage cluster schema has been updated beyond the capability of the existing server installation."); + throw new InstalledSchemaTooAdvancedException(); } else { - for (UpdateFile updateFile : updateFolder.getUpdateFiles()) { - execute(updateFile); + log.info("Storage schema requires udpates. Updating from version " + installedSchemaVersion + + " to version " + requiredSchemaVersion + "."); + + updateFolder.removeAppliedUpdates(installedSchemaVersion); + + if (updateFolder.getUpdateFiles().size() == 0) { + log.info("Storage schema is current! No updates applied."); + } else { + for (UpdateFile updateFile : updateFolder.getUpdateFiles()) { + execute(updateFile); - Properties versionProperties = new Properties(); - versionProperties.put("version", updateFile.extractVersion() + ""); - versionProperties.put("time", System.currentTimeMillis() + ""); - executeManagementQuery(Query.INSERT_SCHEMA_VERSION, versionProperties); + Properties versionProperties = new Properties(); + versionProperties.put("version", updateFile.extractVersion() + ""); + versionProperties.put("time", System.currentTimeMillis() + ""); + executeManagementQuery(Query.INSERT_SCHEMA_VERSION, versionProperties); - log.info("RHQ schema update " + updateFile +" applied."); + log.info("Storage schema update " + updateFile + " applied."); + } } } } finally { @@ -185,7 +203,7 @@ class VersionManager extends AbstractManager { * @throws Exception */ public void drop() throws Exception { - log.info("Preparing to drop RHQ schema"); + log.info("Preparing to drop storage schema."); UpdateFolder updateFolder = new UpdateFolder(Task.Drop.getFolder()); Properties properties = new Properties(System.getProperties()); @@ -209,22 +227,60 @@ class VersionManager extends AbstractManager { if (schemaExists()) { //2. Drop RHQ schema execute(updateFolder.getUpdateFiles().get(1), properties); - log.info("RHQ schema dropped."); + log.info("Storage schema dropped."); } else { - log.info("RHQ schema does not exist. Drop operation not required."); + log.info("Storage schema does not exist. Drop operation not required."); } if (userExists()) { //3. Drop RHQ user execute(updateFolder.getUpdateFiles().get(2), properties); - log.info("RHQ admin user dropped."); + log.info("RHQ admin user dropped from storage cluster."); } else { - log.info("RHQ admin user does not exist. Drop operation not required."); + log.info("RHQ admin user does not exist on the storage cluster. Drop operation not required."); + } + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + shutdownClusterConnection(); + } + } + + /** + * Check storage cluster schema version compatibility. + * If the version installed on the storage cluster is too advanced or too old compared + * to the version available in the current schema manager an error will thrown. + * + * @throws Exception schema compatibility exception + */ + public void checkCompatibility() throws Exception { + log.info("Preparing to check storage schema compatibility."); + try { + initClusterSession(); + + int installedSchemaVersion = this.getInstalledSchemaVersion(); + + UpdateFolder folder = new UpdateFolder(Task.Update.getFolder()); + int requiredSchemaVersion = folder.getLatestVersion(); + + if (installedSchemaVersion < requiredSchemaVersion) { + log.error("Storage cluster schema version:" + installedSchemaVersion + ". Required schema version: " + + requiredSchemaVersion + ". Please update storage cluster schema version."); + throw new InstalledSchemaTooOldException(); + } + + if (installedSchemaVersion > requiredSchemaVersion) { + log.error("Storage cluster schema version:" + installedSchemaVersion + ". Required schema version: " + + requiredSchemaVersion + + ". Storage clutser has been updated beyond the capability of the current server installation."); + throw new InstalledSchemaTooAdvancedException(); } } catch (Exception e) { throw new RuntimeException(e); } finally { shutdownClusterConnection(); + + log.info("Completed check for storage schema compatibility."); } } } diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java new file mode 100644 index 0000000..2f83ef5 --- /dev/null +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooAdvancedException.java @@ -0,0 +1,38 @@ +/* + * + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +package org.rhq.cassandra.schema.exception; + + +/** + * @author Stefan Negrea + */ +public class InstalledSchemaTooAdvancedException extends Exception { + + public InstalledSchemaTooAdvancedException() { + super( + "Storage schema is too advanced for the current installation. Schema revisions have been applied beyond the capability of the installation."); + } +} \ No newline at end of file diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java new file mode 100644 index 0000000..4da863b --- /dev/null +++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/exception/InstalledSchemaTooOldException.java @@ -0,0 +1,38 @@ +/* + * + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +package org.rhq.cassandra.schema.exception; + + +/** + * @author Stefan Negrea + */ +public class InstalledSchemaTooOldException extends Exception { + + public InstalledSchemaTooOldException() { + super( + "Storage schema needs to be updated. The schema manager contains updates not yet applied to the storage cluster installation."); + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/listener/CoreGuiServletContextListener.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/listener/CoreGuiServletContextListener.java index 8260327..67e4389 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/listener/CoreGuiServletContextListener.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/listener/CoreGuiServletContextListener.java @@ -54,7 +54,11 @@ public class CoreGuiServletContextListener implements ServletContextListener { scheduledExecutorService.schedule(new Runnable() { @Override public void run() { - startupBean.init(); + try { + startupBean.init(); + } catch (Exception e) { + shutdownListener.handleNotification(); + } } }, 10, SECONDS); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java index 6828b12..dbd599a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java @@ -40,6 +40,7 @@ import com.datastax.driver.core.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.cassandra.schema.SchemaManager; import org.rhq.cassandra.util.ClusterBuilder; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.util.StringUtil; @@ -86,7 +87,6 @@ public class StorageClientManagerBean { String username = getRequiredStorageProperty(USERNAME_PROP); String password = getRequiredStorageProperty(PASSWORD_PROP); - metricsConfiguration = new MetricsConfiguration(); List<StorageNode> storageNodes = storageNodeManager.getStorageNodes(); if (storageNodes.isEmpty()) { throw new IllegalStateException( @@ -94,12 +94,17 @@ public class StorageClientManagerBean { + "result of running dbsetup or deleting rows from rhq_storage_node table. Please re-install the " + "storage node to fix this issue."); } + + checkSchemaCompability(username, password, storageNodes); + + Session wrappedSession = createSession(username, password, storageNodeManager.getStorageNodes()); session = new StorageSession(wrappedSession); storageClusterMonitor = new StorageClusterMonitor(); session.addStorageStateListener(storageClusterMonitor); + metricsConfiguration = new MetricsConfiguration(); metricsDAO = new MetricsDAO(session, metricsConfiguration); initMetricsServer(); @@ -108,6 +113,22 @@ public class StorageClientManagerBean { log.info("Storage client subsystem is now initialized"); } + /** + * Checks storage node schema compatibility. + * + * @param username username + * @param password password + * @param storageNodes storage nodes + */ + private void checkSchemaCompability(String username, String password, List<StorageNode> storageNodes) { + SchemaManager schemaManager = new SchemaManager(username, password, storageNodes); + try { + schemaManager.checkCompatibility(); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } + public synchronized void shutdown() { if (!initialized) { log.info("Storage client subsystem is already shut down. Skipping shutdown steps."); diff --git a/pom.xml b/pom.xml index 3f2adbd..eb71cb3 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,8 @@ <jboss-modules.version>1.1.1.GA</jboss-modules.version> <jboss-dmr.version>1.1.1.Final</jboss-dmr.version> <jboss-msc.version>1.0.2.GA</jboss-msc.version> + <jboss-vfs.version>3.1.0.Final</jboss-vfs.version> +  <jboss-annotations.version>4.2.3.GA</jboss-annotations.version> commit 5a60d2669e90e87022fcad9f628e987f1aaf5385 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Aug 13 20:43:51 2013 +0200 Improvements to cluster-wide alert UI: improved grouping, headers of groups, link to definition. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java index 9c26b5c..0821585 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import com.smartgwt.client.data.Record; import com.smartgwt.client.types.GroupStartOpen; import com.smartgwt.client.types.ImageStyle; -import com.smartgwt.client.types.SummaryFunctionType; import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGrid; @@ -37,6 +36,8 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.alert.AlertDataSource; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; +import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; +import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; @@ -45,6 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility; * */ public class StorageNodeAlertHistoryView extends AlertHistoryView { + private boolean isGouped = true; public StorageNodeAlertHistoryView(String tableTitle, int[] resourceIds) { super(tableTitle, resourceIds); @@ -64,8 +66,32 @@ public class StorageNodeAlertHistoryView extends AlertHistoryView { continue; } if (AlertCriteria.SORT_FIELD_CTIME.equals(field.getName())) { field.setWidth(240); + field.setShowGridSummary(true); + field.setShowGroupSummary(true); + field.setSummaryFunction(new SummaryFunction() { + public Object getSummaryValue(Record[] records, ListGridField field) { + if (records != null && records.length > 0 && records[0] != null) { + Integer resourceId = records[0].getAttributeAsInt(AncestryUtil.RESOURCE_ID); + Integer defId = records[0].getAttributeAsInt("definitionId"); + String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId, defId); + return LinkManager.getHref(url, "Link to Definition"); + } else return ""; + } + }); + field.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + if (listGridRecord.getAttribute("groupValue") != null) { + return (String) o; + } + Integer resourceId = listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID); + Integer defId = listGridRecord.getAttributeAsInt("definitionId"); + String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId, defId); + return LinkManager.getHref(url, o.toString()); + } + }); + field.setWidth(240); } else if ("conditionValue".equals(field.getName())) { - field.setWidth(90); + field.setWidth(140); } else if ("acknowledgingSubject".equals(field.getName())) { field.setSummaryFunction(new SummaryFunction() { public Object getSummaryValue(Record[] records, ListGridField field) { @@ -74,8 +100,8 @@ public class StorageNodeAlertHistoryView extends AlertHistoryView { if (record.getAttribute("acknowledgingSubject") != null) { count++; } - } - return count + " Unacked"; + } + return "(" + count + " / " + records.length + ")"; } }); field.setCellFormatter(new CellFormatter() { @@ -100,20 +126,12 @@ public class StorageNodeAlertHistoryView extends AlertHistoryView { newFields.add(1, field); continue; } else if ("name".equals(field.getName())) { - field.setShowGridSummary(true); - field.setShowGroupSummary(true); - field.setSummaryFunction(SummaryFunctionType.COUNT); field.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - if (listGridRecord.getAttribute("groupValue") != null) { - return (String) o; - } - Integer resourceId = listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID); - Integer defId = listGridRecord.getAttributeAsInt("definitionId"); - String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId, defId); - return LinkManager.getHref(url, o.toString()); + return o.toString(); } }); + field.setHidden(true); } newFields.add(field); } @@ -142,6 +160,9 @@ public class StorageNodeAlertHistoryView extends AlertHistoryView { if (value == null) { return ""; } + if (record.getAttribute("groupValue") != null) { + return value.toString(); + } String detailsUrl = getDetailUrlFromRecord(record); String formattedValue = StringUtility.escapeHtml(value.toString()); return LinkManager.getHref(detailsUrl, formattedValue); @@ -169,5 +190,20 @@ public class StorageNodeAlertHistoryView extends AlertHistoryView { throw new IllegalArgumentException(msg); } } - + + @Override + protected void configureTable() { + super.configureTable(); + addTableAction("(Un)Group Alerts", new AbstractTableAction(TableActionEnablement.ALWAYS) { + public void executeAction(ListGridRecord[] selection, Object actionValue) { + if (isGouped) { + getListGrid().ungroup(); + } else { + getListGrid().groupBy("name"); + } + isGouped = !isGouped; + refreshTableInfo(); + } + }); + } } commit eb914a6d455656d5f24a7dfae93f7eb39201926c Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Aug 13 18:43:59 2013 +0200 Storage node configuration: added check for Max Heap Size (-Xmx) > Heap New Size (-Xmn). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java index f1c0003..7bcf2cd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java @@ -19,8 +19,10 @@ package org.rhq.enterprise.gui.coregui.client.admin.storage; import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Set; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -194,7 +196,7 @@ public class StorageNodeConfigurationEditor extends EnhancedVLayout implements R FIELD_HEAP_MAX, "Max Heap Size", configuration.getHeapSize(), - "The maximum heap size. This value will be used with the -Xmx JVM option. The value should be an integer with a suffix of M or G to indicate megabytes or gigabytes.")); + "The maximum heap size. This value will be used with the -Xmx JVM option. If you are going to increase/decrease this value, then you should also increase/decrease the new generation proportionally. The value should be an integer with a suffix of M or G to indicate megabytes or gigabytes.")); items .addAll(buildOneFormRowWithCombobox( FIELD_HEAP_NEW, @@ -233,6 +235,13 @@ public class StorageNodeConfigurationEditor extends EnhancedVLayout implements R saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { if (form.validate()) { + if (!checkNewHeapLowerThanMaxHeap()) { + Map<String, String> errors = new HashMap<String, String>(2); + errors.put(FIELD_HEAP_MAX, "Should be lower than Heap New Size."); + errors.put(FIELD_HEAP_NEW, "Should be higher than Max Heap Size."); + form.setErrors(errors, true); + return; + } SC.ask( "Changing the storage node configuration requires restart of storage node. Do you want to continue?", new BooleanCallback() { @@ -263,6 +272,30 @@ public class StorageNodeConfigurationEditor extends EnhancedVLayout implements R return configuration; } + private boolean checkNewHeapLowerThanMaxHeap() { + // let's be paranoid + Object maxHeapObject = form.getField(FIELD_HEAP_MAX).getValue(); + Object newHeapObject = form.getField(FIELD_HEAP_NEW).getValue(); + + String maxHeapString = maxHeapObject != null ? maxHeapObject.toString().trim() : ""; + String newHeapString = newHeapObject != null ? newHeapObject.toString().trim() : ""; + + if (maxHeapString.isEmpty() || newHeapString.isEmpty()) { + return false; + } + + int maxHeap = Integer.parseInt(maxHeapString.substring(0, maxHeapString.length() - 2)); + int newHeap = Integer.parseInt(newHeapString.substring(0, newHeapString.length() - 2)); + + boolean isMaxHeapInMegs = maxHeapString.toLowerCase().indexOf("m") != -1; + boolean isNewHeapInMegs = newHeapString.toLowerCase().indexOf("m") != -1; + + maxHeap = isMaxHeapInMegs ? maxHeap : maxHeap * 1024; + newHeap = isNewHeapInMegs ? newHeap : newHeap * 1024; + + return newHeap < maxHeap; + } + private String getJVMMemoryString(String raw) { if (raw == null || raw.trim().isEmpty()) { throw new IllegalArgumentException("input string is null or empty"); commit eb6d49756238bef5d2435927a04cbe44dea2805b Author: Jirka Kremser <jkremser(a)redhat.com> Date: Tue Aug 13 12:57:44 2013 +0200 api checks: adding the return type of intentionally changed method for clirr to make it work diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index b14d38e..6a22ea5 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -11,7 +11,7 @@ <difference> <className>org/rhq/core/domain/cloud/Server</className> <differenceType>7004</differenceType> - <method>clearStatus()</method> + <method>void clearStatus()</method> <justification> This class is not exposed remotely. The previous method signature was doing a blind clear of the status. The new method will clear only the specified status. commit c9283bd57a3bd4efc410f3a54b948c382cbc4626 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Mon Aug 12 21:40:05 2013 +0200 New component for storage node alerts (derived from AlertHistoryView); Predefined alert templates shoud have the description fields correctly filled.; calling the update configuration method in an async way. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java index 5538db5..cd0ec54 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAdminView.java @@ -18,14 +18,22 @@ */ package org.rhq.enterprise.gui.coregui.client.admin.storage; +import java.util.ArrayList; import java.util.EnumSet; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.types.GroupStartOpen; import com.smartgwt.client.widgets.Label; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.tab.events.TabSelectedEvent; import com.smartgwt.client.widgets.tab.events.TabSelectedHandler; +import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; @@ -34,17 +42,22 @@ import org.rhq.core.domain.util.collection.ArrayUtils; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView; +import org.rhq.enterprise.gui.coregui.client.alert.AlertDataSource; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTab; import org.rhq.enterprise.gui.coregui.client.components.tab.NamedTabSet; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.configuration.GroupResourceConfigurationEditView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; +import org.rhq.enterprise.gui.coregui.client.util.StringUtility; import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -120,7 +133,8 @@ public class StorageNodeAdminView extends EnhancedVLayout implements/* HasViewNa tabset.getTabByName(tabInfo.name.getName()).setPane(new Label("in progress..")); } else if (tabInfo.equals(alertsTabInfo)) { if (resIds != null) { - tabset.getTabByName(tabInfo.name.getName()).setPane(new AlertHistoryView("storageNodesAlerts", resIds)); + tabset.getTabByName(tabInfo.name.getName()).setPane( + new StorageNodeAlertHistoryView("storageNodesAlerts", resIds)); } else { GWTServiceLookup.getStorageService().findResourcesWithAlertDefinitions(new AsyncCallback<Integer[]>() { @Override @@ -137,7 +151,7 @@ public class StorageNodeAdminView extends EnhancedVLayout implements/* HasViewNa } else { resIds = ArrayUtils.unwrapArray(result); tabset.getTabByName(tabInfo.name.getName()).setPane( - new AlertHistoryView("storageNodesAlerts", resIds)); + new StorageNodeAlertHistoryView("storageNodesAlerts", resIds)); tabset.selectTab(tabInfo.index); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java new file mode 100644 index 0000000..9c26b5c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeAlertHistoryView.java @@ -0,0 +1,173 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.coregui.client.admin.storage; + +import java.util.ArrayList; + +import com.smartgwt.client.data.Record; +import com.smartgwt.client.types.GroupStartOpen; +import com.smartgwt.client.types.ImageStyle; +import com.smartgwt.client.types.SummaryFunctionType; +import com.smartgwt.client.widgets.Img; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.SummaryFunction; + +import org.rhq.core.domain.criteria.AlertCriteria; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.alert.AlertDataSource; +import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; +import org.rhq.enterprise.gui.coregui.client.util.StringUtility; + +/** + * @author Jirka Kremser + * + */ +public class StorageNodeAlertHistoryView extends AlertHistoryView { + + public StorageNodeAlertHistoryView(String tableTitle, int[] resourceIds) { + super(tableTitle, resourceIds); + } + + @Override + public AlertDataSource getDataSource() { + return new AlertDataSource() { + @Override + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = super.getListGridFields(); + ArrayList<ListGridField> newFields = new ArrayList<ListGridField>(fields.size()); + for (ListGridField field : fields) { + if ("priority".equals(field.getName()) + || AncestryUtil.RESOURCE_NAME.equals(field.getName()) + || AncestryUtil.RESOURCE_ANCESTRY.equals(field.getName())) { + continue; + } if (AlertCriteria.SORT_FIELD_CTIME.equals(field.getName())) { + field.setWidth(240); + } else if ("conditionValue".equals(field.getName())) { + field.setWidth(90); + } else if ("acknowledgingSubject".equals(field.getName())) { + field.setSummaryFunction(new SummaryFunction() { + public Object getSummaryValue(Record[] records, ListGridField field) { + int count = 0; + for (Record record : records) { + if (record.getAttribute("acknowledgingSubject") != null) { + count++; + } + } + return count + " Unacked"; + } + }); + field.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + if (listGridRecord.getAttribute("groupValue") != null) { + return (String) o; + } + String ackSubject = listGridRecord.getAttribute("acknowledgingSubject"); + if (ackSubject == null) { + return " "; + } else { + Img checkedImg = new Img(ImageManager.getAlertStatusCheckedIcon(), 80, 16); + checkedImg.setImageType(ImageStyle.CENTER); + return checkedImg.getInnerHTML(); + } + } + }); + + field.setShowGridSummary(false); + field.setShowGroupSummary(true); + field.setWidth(90); + newFields.add(1, field); + continue; + } else if ("name".equals(field.getName())) { + field.setShowGridSummary(true); + field.setShowGroupSummary(true); + field.setSummaryFunction(SummaryFunctionType.COUNT); + field.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + if (listGridRecord.getAttribute("groupValue") != null) { + return (String) o; + } + Integer resourceId = listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID); + Integer defId = listGridRecord.getAttributeAsInt("definitionId"); + String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId, defId); + return LinkManager.getHref(url, o.toString()); + } + }); + } + newFields.add(field); + } + ListGridField descriptionField = new ListGridField("description", MSG.common_title_description()); + descriptionField.setCanSortClientOnly(true); + newFields.add(descriptionField); + return newFields; + } + }; + } + + @Override + protected void configureListGrid(ListGrid grid) { + ListGrid listGrid = super.getListGrid(); + listGrid.setGroupStartOpen(GroupStartOpen.ALL); + listGrid.setShowGroupSummary(true); + listGrid.setShowGroupSummaryInHeader(true); + + listGrid.setGroupByField("name"); + } + + @Override + protected CellFormatter getDetailsLinkColumnCellFormatter() { + return new CellFormatter() { + public String format(Object value, ListGridRecord record, int i, int i1) { + if (value == null) { + return ""; + } + String detailsUrl = getDetailUrlFromRecord(record); + String formattedValue = StringUtility.escapeHtml(value.toString()); + return LinkManager.getHref(detailsUrl, formattedValue); + } + }; + } + + @Override + public void showDetails(ListGridRecord record) { + CoreGUI.goToView(getDetailUrlFromRecord(record)); + } + + private String getDetailUrlFromRecord(ListGridRecord record) { + if (record == null) { + throw new IllegalArgumentException("'record' parameter is null."); + } + Integer recordId = getId(record); + Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); + if (recordId != null && recordId.intValue() > 0 && resourceId != null && resourceId > 0) { + return "#Resource/" + resourceId + "/Alerts/History/" + convertIDToCurrentViewPath(recordId); + } else { + String msg = MSG.view_tableSection_error_badId(this.getClass().toString(), (recordId == null) ? "null" + : recordId.toString()); + CoreGUI.getErrorHandler().handleError(msg); + throw new IllegalArgumentException(msg); + } + } + +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java index 3c4923b..f1c0003 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/StorageNodeConfigurationEditor.java @@ -74,15 +74,12 @@ public class StorageNodeConfigurationEditor extends EnhancedVLayout implements R private void save() { updateConfiguration(); - GWTServiceLookup.getStorageService().updateConfiguration(configuration, new AsyncCallback<Boolean>() { - public void onSuccess(Boolean result) { - if (result) { - Message msg = new Message("Storage node settings were successfully updated.", Message.Severity.Info); - CoreGUI.getMessageCenter().notify(msg); - } else { - onFailure(new Exception("Operation failed.")); - } + GWTServiceLookup.getStorageService().updateConfiguration(configuration, new AsyncCallback<Void>() { + public void onSuccess(Void result) { + Message msg = new Message("Storage node settings were successfully updated.", Message.Severity.Info); + CoreGUI.getMessageCenter().notify(msg); } + public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError("Unable to update the storage node settings.", caught); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java index 6e6df57..957bf34 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/StorageGWTService.java @@ -84,5 +84,5 @@ public interface StorageGWTService extends RemoteService { StorageNodeConfigurationComposite retrieveConfiguration(StorageNode storageNode) throws RuntimeException; - boolean updateConfiguration(StorageNodeConfigurationComposite storageNodeConfiguration) throws RuntimeException; + void updateConfiguration(StorageNodeConfigurationComposite storageNodeConfiguration) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java index 4a01427..f7f7442 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/StorageGWTServiceImpl.java @@ -163,9 +163,9 @@ public class StorageGWTServiceImpl extends AbstractGWTServiceImpl implements Sto } @Override - public boolean updateConfiguration(StorageNodeConfigurationComposite storageNodeConfiguration) throws RuntimeException { + public void updateConfiguration(StorageNodeConfigurationComposite storageNodeConfiguration) throws RuntimeException { try { - return storageNodeManager.updateConfiguration(getSessionSubject(), storageNodeConfiguration); + storageNodeManager.updateConfigurationAsync(getSessionSubject(), storageNodeConfiguration); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 053b57e..9e41692 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -36,6 +36,11 @@ import java.util.Map; import java.util.Queue; import java.util.Set; +import org.rhq.enterprise.server.storage.StorageClusterSettings; +import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerBean; +import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; + +import javax.ejb.Asynchronous; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; @@ -83,9 +88,6 @@ import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; import org.rhq.enterprise.server.scheduler.SchedulerLocal; -import org.rhq.enterprise.server.storage.StorageClusterSettings; -import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerBean; -import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; @@ -624,6 +626,12 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN return configuration; } + + @Override + @Asynchronous + public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { + updateConfiguration(subject, storageNodeConfiguration); + } @Override public boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java index 0c1b0ab..b5ee7f0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java @@ -65,6 +65,8 @@ public interface StorageNodeManagerLocal { StorageNodeConfigurationComposite retrieveConfiguration(Subject subject, StorageNode storageNode); boolean updateConfiguration(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); + + void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration); /** * Fetches the list of StorageNode entities based on provided criteria. diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 840477c..f752d1d 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -258,6 +258,7 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setResourceType(resourceType); newTemplate.setPriority(AlertPriority.MEDIUM); newTemplate.setConditionExpression(BooleanExpression.ANY); + newTemplate.setDescription(storageNodeHighHeapTemplate.getDescription()); newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); @@ -308,6 +309,7 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setResourceType(resourceType); newTemplate.setPriority(AlertPriority.MEDIUM); newTemplate.setConditionExpression(BooleanExpression.ANY); + newTemplate.setDescription(storageNodeHighDiskUsageTemplate.getDescription()); newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); @@ -377,6 +379,7 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone newTemplate.setResourceType(resourceType); newTemplate.setPriority(AlertPriority.MEDIUM); newTemplate.setConditionExpression(BooleanExpression.ANY); + newTemplate.setDescription(storageNodeSnapshotFailureTemplate.getDescription()); newTemplate.setRecoveryId(0); newTemplate.setEnabled(true); commit bd60c17abb96278e4288bcbc97a6ab518e5738e6 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Aug 12 12:17:17 2013 -0500 Slight change to the comment text. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java index 7fa82f7..671db6b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java @@ -88,9 +88,9 @@ import org.rhq.core.domain.resource.Agent; + " AND ( s.name <> :thisServerName OR :thisServerName IS NULL ) "), // @NamedQuery(name = Server.QUERY_UPDATE_STATUS_BY_NAME, query = "" // + " UPDATE Server s " // - + " SET s.status = 3 " //change this to the only value possible before adding MANUAL_MAINTENANCE_MODE - //this status should never be set to negative numbers since they are values allowed - //by the bitmask. + + " SET s.status = 3 " //Change this to the only value possible before adding MANUAL_MAINTENANCE_MODE. + //This status should never be set to negative since negative values are not + //allowed by the bitmask. + " WHERE s.status = 0 ") }) @SequenceGenerator(allocationSize = org.rhq.core.domain.util.Constants.ALLOCATION_SIZE, name = "RHQ_SERVER_ID_SEQ", sequenceName = "RHQ_SERVER_ID_SEQ") @Table(name = "RHQ_SERVER") commit d1414a0826353671c22044d8438181963e518217 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Aug 12 12:09:47 2013 -0500 One more attempt at the justification for the Server interface change. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index 6630d2c..b14d38e 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -11,7 +11,7 @@ <difference> <className>org/rhq/core/domain/cloud/Server</className> <differenceType>7004</differenceType> - <method>clearStatus(*)</method> + <method>clearStatus()</method> <justification> This class is not exposed remotely. The previous method signature was doing a blind clear of the status. The new method will clear only the specified status. commit b00b9503c9367919969a7920d2a2091a9c7268d1 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Aug 12 12:09:10 2013 -0500 Update code related to initial value of status field. Also, reserved the first five bits of the bitmask for debug purposes. Because the field was initialized to -1 it was wrongly computing flags during startup resulting in a false manual maintenance mode. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java index caeabcf..7fa82f7 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java @@ -49,7 +49,7 @@ import org.rhq.core.domain.resource.Agent; /** * An RHQ server node in the cluster - * + * * @author Joseph Marques */ @Entity(name = "Server") @@ -88,7 +88,9 @@ import org.rhq.core.domain.resource.Agent; + " AND ( s.name <> :thisServerName OR :thisServerName IS NULL ) "), // @NamedQuery(name = Server.QUERY_UPDATE_STATUS_BY_NAME, query = "" // + " UPDATE Server s " // - + " SET s.status = -1 " // negative numbers so that bitmask strat does not conflict with this one + + " SET s.status = 3 " //change this to the only value possible before adding MANUAL_MAINTENANCE_MODE + //this status should never be set to negative numbers since they are values allowed + //by the bitmask. + " WHERE s.status = 0 ") }) @SequenceGenerator(allocationSize = org.rhq.core.domain.util.Constants.ALLOCATION_SIZE, name = "RHQ_SERVER_ID_SEQ", sequenceName = "RHQ_SERVER_ID_SEQ") @Table(name = "RHQ_SERVER") @@ -276,7 +278,7 @@ public class Server implements Serializable { /** * Returns 0 if this server is current. Otherwise, returns a mask of {@link Server.Status} * elements corresponding to the updates that have occurred that are related to this server. - * + * * @return 0 if this server is current. Otherwise, returns a mask of {@link Server.Status} * elements corresponding to the updates that have occurred that are related to this server. */ @@ -320,11 +322,17 @@ public class Server implements Serializable { return Status.getMessages(status); } + //Please read BZ 535484 for initial design: https://bugzilla.redhat.com/show_bug.cgi?id=535484 + //Prior to MANUAL_MAINTENANCE_MODE only used for debug purposes, design now changed to + //persist statuses between server restarts in production code public enum Status { + //Debug only flags (first five bits are reserved for debug flags) RESOURCE_HIERARCHY_UPDATED(1, "The resource hierarchy has been updated"), // ALERT_DEFINITION(2, "Some alert definition with a global condition category was updated"), - MANUAL_MAINTENANCE_MODE(4,"Manual Maintenance mode setup by the user either via UI or properties file."); + + //Production flags + MANUAL_MAINTENANCE_MODE(32, "Manual Maintenance mode setup by the user either via UI or properties file."); public final int mask; public final String message; commit a33fcb1f904a1652636e45e7895584b399d32971 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Aug 12 09:53:23 2013 -0400 Fix dbupgrade issue in storagenode address task. Needs to properly support non-postgres dbs. diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java index 9fc90ed..0bd8277 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeAddressUpgradeTask.java @@ -6,12 +6,12 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.List; +import mazz.i18n.Logger; + import org.rhq.core.db.DatabaseType; import org.rhq.core.db.DbUtilsI18NFactory; import org.rhq.core.db.DbUtilsI18NResourceKeys; -import mazz.i18n.Logger; - /** * Updates the address field of storage node entities to ensure we are storing IP addresses and not hostnames. We want * to store the IP address since that is what Cassandra uses for inter-node communication. JMX operations that return @@ -34,7 +34,7 @@ public class StorageNodeAddressUpgradeTask implements DatabaseUpgradeTask { String storageNodeAddress = null; try { for (Object[] row : results) { - id = (Integer) row[0]; + id = databaseType.getInteger(row[0]); storageNodeAddress = (String) row[1]; InetAddress address = InetAddress.getByName(storageNodeAddress); if (!storageNodeAddress.equals(address.getHostAddress())) { commit ac4563e9037db0fcc9531cf981d50288ba6490bd Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Aug 9 15:46:30 2013 -0400 update sample bundles with new required 'compliance' attribute diff --git a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip index c044d9a..b574072 100644 Binary files a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip and b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip differ diff --git a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip index f8b3392..ad42eb7 100644 Binary files a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip and b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip differ commit 34e1c7b697a0b345ae4a7b2385e1bc4aff10e19f Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Aug 9 18:18:25 2013 -0500 Thanks Eclipse for clipping an import on save :( diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 2f91dba..053b57e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -85,6 +85,7 @@ import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; import org.rhq.enterprise.server.scheduler.SchedulerLocal; import org.rhq.enterprise.server.storage.StorageClusterSettings; import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerBean; +import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; commit 112d5f3a218755dcc68fbb6ff9455560276b69af Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Aug 9 16:47:12 2013 -0500 Simplify the configuration update method by allowing the plugin to restart the storage node if necessary. This is possible now because the JMX port is no longer required for checking the cluster availability. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index d21be2f..2f91dba 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -85,7 +85,6 @@ import org.rhq.enterprise.server.rest.reporting.MeasurementConverter; import org.rhq.enterprise.server.scheduler.SchedulerLocal; import org.rhq.enterprise.server.storage.StorageClusterSettings; import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerBean; -import org.rhq.enterprise.server.storage.StorageNodeOperationsHandlerLocal; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil; @@ -643,7 +642,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN if (storageNodeConfiguration.getThreadStackSize() != null) { parameters.setSimpleValue("threadStackSize", storageNodeConfiguration.getThreadStackSize() + ""); } - parameters.setSimpleValue("restartIfRequired", "false"); + parameters.setSimpleValue("restartIfRequired", "true"); Resource storageNodeResource = storageNode.getResource(); @@ -656,13 +655,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN storageNode.setJmxPort(storageNodeConfiguration.getJmxPort()); entityManager.merge(storageNode); - //3. Restart the storage node - result = runOperationAndWaitForResult(subject, storageNodeResource, RESTART_OPERATION, - new Configuration()); - - //4. Update the plugin configuration to talk with the new server - //Up to this point communication with the storage node should not have been affected by the intermediate - //changes + //3. Update the plugin configuration to talk with the new server Configuration storageNodePluginConfig = configurationManager.getPluginConfiguration(subject, storageNodeResource.getId()); commit d1aa8e0eaf0cc2ac72b09599ddc406f9928cbdd9 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Aug 9 16:39:30 2013 -0500 [BZ 995424] + [BZ 991598] + Code Review changes Updates to the server operation mode design based on code review and recent BZs. The most important change is initalizing the storage cluster connection ahead of initializing the server. This will elliminate place the server in maintenance mode because the storage cluster connection is not yet initialized. diff --git a/modules/core/domain/intentional-api-changes-since-4.8.0.xml b/modules/core/domain/intentional-api-changes-since-4.8.0.xml index a8a77b4..6630d2c 100644 --- a/modules/core/domain/intentional-api-changes-since-4.8.0.xml +++ b/modules/core/domain/intentional-api-changes-since-4.8.0.xml @@ -8,4 +8,13 @@ Changing StorageNode.QUERY_FIND_BY_ADDRESS. The constants for native queries shouldn't be part of the public API. </justification> </difference> + <difference> + <className>org/rhq/core/domain/cloud/Server</className> + <differenceType>7004</differenceType> + <method>clearStatus(*)</method> + <justification> + This class is not exposed remotely. The previous method signature was doing a blind clear of the status. + The new method will clear only the specified status. + </justification> + </difference> </differences> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java index c43a234..caeabcf 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java @@ -241,19 +241,19 @@ public class Server implements Serializable { NORMAL("This server is a Normal Member of the HA server cloud", true); public final String message; - private final boolean configurable; + private final boolean readOnly; private OperationMode(String message, boolean configurable) { this.message = message; - this.configurable = configurable; + this.readOnly = configurable; } public String getMessage() { return message; } - public boolean isConfigurable() { - return configurable; + public boolean isReadOnly() { + return readOnly; } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/TopologyManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/TopologyManagerBean.java index 4db1697..c4225de 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/TopologyManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/TopologyManagerBean.java @@ -241,7 +241,7 @@ public class TopologyManagerBean implements TopologyManagerLocal { if (mode == null) { throw new IllegalArgumentException("Mode cannot be null."); } - if (!mode.isConfigurable()) { + if (!mode.isReadOnly()) { throw new IllegalArgumentException("Cannot directly set a mode that is not configurable. Mode " + mode.name() + " is not configurable."); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java index 44bd557..ddbd0ba 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java @@ -270,7 +270,7 @@ public class ServerManagerBean implements ServerManagerLocal { lastEstablishedServerMode = serverMode; server.setOperationMode(lastEstablishedServerMode); server.setMtime(System.currentTimeMillis()); - } catch (Exception e) { + } catch (Throwable e) { log.error("Unable to change HA Server Mode from " + lastEstablishedServerMode + " to " + serverMode + ": " + e); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java index b0187e5..d99bb7b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java @@ -185,6 +185,10 @@ public class StartupBean implements StartupLocal { log.error("Could not load ResourceFacets cache.", t); } + //Server depends on the storage cluster availability. Since the storage client init just + //establishes connectivity with the storage cluster, then run it before the server init. + initStorageClient(); + // Before starting determine the operating mode of this server and // take any necessary initialization action. Must happen before comm startup since listeners // may be added. @@ -203,7 +207,6 @@ public class StartupBean implements StartupLocal { startPluginDeployer(); // make sure this is initialized before starting the server plugin container startServerPluginContainer(); // before comm in case an agent wants to talk to it upgradeRhqUserSecurityDomainIfNeeded(); - initStorageClient(); startServerCommunicationServices(); startScheduler(); scheduleJobs(); @@ -436,7 +439,6 @@ public class StartupBean implements StartupLocal { */ private void initStorageClient() { storageClientManager.init(); - serverManager.establishCurrentServerMode(); } /** @@ -659,7 +661,7 @@ public class StartupBean implements StartupLocal { log.error("Cannot create storage cluster read repair job", e); } } - + /** * This seeds the agent clients cache with clients for all known agents. These clients will be started so they can * immediately begin to send any persisted guaranteed messages that might already exist. This method must be called diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java index c8f44d9..3f7af3f 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java @@ -29,14 +29,6 @@ public class StorageSession implements Host.StateListener { public void addStorageStateListener(StorageStateListener listener) { listeners.add(listener); - - for (Host host : wrappedSession.getCluster().getMetadata().getAllHosts()) { - if(host.getMonitor().isUp()){ - listener.onStorageNodeUp(host.getAddress()); - } else { - listener.onStorageNodeUp(host.getAddress()); - } - } } public ResultSet execute(String query) { commit b6e84bf4ea7ed48672c1309c571634560f5b38af Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Aug 9 14:00:58 2013 -0700 Fix graph labels for chrome & IE. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index 3e573dd..64c355d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -260,8 +260,6 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { .attr("fill", "#b0b0b0") .attr("stroke-width", "0.5") .attr("transform", "translate(0," + height + ")") - .attr("letter-spacing", "3") - .style("text-anchor", "end") .call(xAxis); svg.append("text") @@ -296,6 +294,8 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { } + + function createHovers() { $wnd.jQuery('svg rect.availBars').tipsy({ gravity: 's', diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java index 67552d3..0c95f44 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java @@ -469,8 +469,6 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { svg.append("g") .attr("class", "x axis") .attr("transform", "translate(0," + height + ")") - .attr("letter-spacing", "3") - .style("text-anchor", "end") .call(xAxis); @@ -481,7 +479,6 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph { .append("text") .attr("transform", "rotate(-90),translate( -60,0)") .attr("y", -30) - .attr("letter-spacing", "3") .style("text-anchor", "end") .text(chartContext.yAxisUnits === "NONE" ? "" : chartContext.yAxisUnits);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits August 2013