Skip to content

Commit 7f9c97f

Browse files
authored
createDomain create LogFilter, XMLEntity Cache, and XML Registry earlier (#872)
* create LogFilter, XMLEntity Cache, and XML Registry earlier in the flow. Server/Log depends on LogFilter. Fixes #871
1 parent baf0b2c commit 7f9c97f

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ def __extend_domain(self, domain_home):
470470

471471
resources_dict = self.model.get_model_resources()
472472
jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
473+
self.__create_mbeans_used_by_topology_mbeans(topology_folder_list)
473474
self.__create_machines_clusters_and_servers(delete_now=False)
474475
self.__configure_fmw_infra_database()
475476

@@ -549,6 +550,7 @@ def __extend_domain_with_select_template(self, domain_home):
549550

550551
resources_dict = self.model.get_model_resources()
551552
jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
553+
self.__create_mbeans_used_by_topology_mbeans(topology_folder_list)
552554
self.__create_machines_clusters_and_servers(delete_now=False)
553555

554556
server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
@@ -622,7 +624,8 @@ def __apply_base_domain_config(self, topology_folder_list):
622624

623625
topology_folder_list.remove(SECURITY_CONFIGURATION)
624626

625-
self.__create_mbeans_used_by_topology_mbeans(location, topology_folder_list)
627+
self.__create_reliable_delivery_policy(location)
628+
topology_folder_list.remove(WS_RELIABLE_DELIVERY_POLICY)
626629

627630
# these deletions were intentionally skipped when these elements are first created.
628631
self.topology_helper.remove_deleted_clusters_and_servers(location, self._topology)
@@ -663,16 +666,21 @@ def __set_core_domain_params(self):
663666
self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
664667
return
665668

666-
def __create_mbeans_used_by_topology_mbeans(self, location, topology_folder_list):
669+
def __create_mbeans_used_by_topology_mbeans(self, topology_folder_list):
667670
"""
668671
Create the entities that are referenced by domain, machine, server and server template attributes.
669-
:param location: current location
672+
:param topology_folder_list: the model topology folder list to process
670673
:raises: CreateException: if an error occurs
671674
"""
675+
_method_name = '__create_mbeans_used_by_topology_mbeans'
676+
location = LocationContext()
677+
domain_name_token = self.aliases.get_name_token(location)
678+
location.add_name_token(domain_name_token, self._domain_name)
679+
680+
self.logger.entering(str(location), class_name=self.__class_name, method_name=_method_name)
672681
self.__create_log_filters(location)
673682
topology_folder_list.remove(LOG_FILTER)
674-
self.__create_reliable_delivery_policy(location)
675-
topology_folder_list.remove(WS_RELIABLE_DELIVERY_POLICY)
683+
676684
self.__create_xml_entity_cache(location)
677685
topology_folder_list.remove(XML_ENTITY_CACHE)
678686
self.__create_xml_registry(location)

0 commit comments

Comments
 (0)