From ea619694103de616a3dd5b244421f78986dc1bac Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Thu, 15 Apr 2021 10:51:27 -0500 Subject: [PATCH 1/3] create LogFilter, XMLEntity Cache, and XML Registry earlier in the flow. Server/Log depends on LogFilter. Fixes #871 --- .../wlsdeploy/tool/create/domain_creator.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py index 3b3f44eb8c..8ea520d00d 100644 --- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py +++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py @@ -549,6 +549,7 @@ def __extend_domain_with_select_template(self, domain_home): resources_dict = self.model.get_model_resources() jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict) + self.__create_mbeans_used_by_topology_mbeans(topology_folder_list) self.__create_machines_clusters_and_servers(delete_now=False) server_groups_to_target = self._domain_typedef.get_server_groups_to_target() @@ -622,7 +623,8 @@ def __apply_base_domain_config(self, topology_folder_list): topology_folder_list.remove(SECURITY_CONFIGURATION) - self.__create_mbeans_used_by_topology_mbeans(location, topology_folder_list) + self.__create_reliable_delivery_policy(location) + topology_folder_list.remove(WS_RELIABLE_DELIVERY_POLICY) # these deletions were intentionally skipped when these elements are first created. self.topology_helper.remove_deleted_clusters_and_servers(location, self._topology) @@ -663,16 +665,21 @@ def __set_core_domain_params(self): self.logger.exiting(class_name=self.__class_name, method_name=_method_name) return - def __create_mbeans_used_by_topology_mbeans(self, location, topology_folder_list): + def __create_mbeans_used_by_topology_mbeans(self, topology_folder_list): """ Create the entities that are referenced by domain, machine, server and server template attributes. :param location: current location :raises: CreateException: if an error occurs """ + _method_name = '__create_mbeans_used_by_topology_mbeans' + location = LocationContext() + domain_name_token = self.aliases.get_name_token(location) + location.add_name_token(domain_name_token, self._domain_name) + + self.logger.entering(str(location), class_name=self.__class_name, method_name=_method_name) self.__create_log_filters(location) topology_folder_list.remove(LOG_FILTER) - self.__create_reliable_delivery_policy(location) - topology_folder_list.remove(WS_RELIABLE_DELIVERY_POLICY) + self.__create_xml_entity_cache(location) topology_folder_list.remove(XML_ENTITY_CACHE) self.__create_xml_registry(location) From 10e5c37436e55d67a0ea4810507c48b695fa288f Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Thu, 15 Apr 2021 14:15:08 -0500 Subject: [PATCH 2/3] fixed javadoc comment for __create_mbeans_used_by_topology_mbeans --- core/src/main/python/wlsdeploy/tool/create/domain_creator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py index 8ea520d00d..d75fead41e 100644 --- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py +++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py @@ -668,7 +668,7 @@ def __set_core_domain_params(self): def __create_mbeans_used_by_topology_mbeans(self, topology_folder_list): """ Create the entities that are referenced by domain, machine, server and server template attributes. - :param location: current location + :param topology_folder_list: the model topology folder list to process :raises: CreateException: if an error occurs """ _method_name = '__create_mbeans_used_by_topology_mbeans' From 3284a5ee024f01ab36c24dbad1e6744f47857447 Mon Sep 17 00:00:00 2001 From: Derek Sharpe Date: Thu, 15 Apr 2021 14:23:06 -0500 Subject: [PATCH 3/3] fixed for RK, apply same change to non-selectTemplate path --- core/src/main/python/wlsdeploy/tool/create/domain_creator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py index d75fead41e..13e8e39ee2 100644 --- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py +++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py @@ -470,6 +470,7 @@ def __extend_domain(self, domain_home): resources_dict = self.model.get_model_resources() jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict) + self.__create_mbeans_used_by_topology_mbeans(topology_folder_list) self.__create_machines_clusters_and_servers(delete_now=False) self.__configure_fmw_infra_database()