Added maxparallel variables based on number of available cores

vimalmeena238 · jotruon · commit 5c23b4ce3786 · 2022-10-28T12:18:57.000-07:00
diff --git a/internal/resourcediscovery/export_compartment.go b/internal/resourcediscovery/export_compartment.go
@@ -45,10 +45,6 @@ type ResourceDiscoveryStage int
 const (
 	Discovery       ResourceDiscoveryStage = 1
 	GeneratingState                        = 2
-	// maximum goroutines for finding resources in a step at base level.
-	// Value of MaxParallelFindResources is decided based on perf analysis and experiments.
-	// Note: SubResources will be discovered sequentially.
-	MaxParallelFindResource = 16
 )
 
 var (
@@ -57,6 +53,8 @@ var (
 	missingAttributesPerResourceLock sync.Mutex
 	sem                              chan struct{}
 	exportConfigProvider             oci_common.ConfigurationProvider
+	MaxParallelFindResource          int
+	MaxParallelChunks                int
 
 	tfexecConfigVar                     = tfexec.Config
 	tfexecStateVar                      = tfexec.State
@@ -292,6 +290,15 @@ func RunExportCommand(args *tf_export.ExportCommandArgs) (err error, status Stat
 
 	sem = make(chan struct{}, args.Parallelism)
 
+	// maximum goroutines for finding resources in a step at base level.
+	// Value of MaxParallelFindResources is decided based on perf analysis and experiments.
+	// Note: SubResources will be discovered sequentially.
+	numCPU := runtime.NumCPU()
+	MaxParallelFindResource = numCPU * 4
+	// max parallel chunks for state genation that can be executed in parallel
+	MaxParallelChunks = numCPU
+	utils.Debugf("[INFO] Setting MaxParalleFindResources=%d, MaxParallelChunks=%d", MaxParallelFindResource, MaxParallelChunks)
+
 	ctx, err := createResourceDiscoveryContext(clients.(*tf_client.OracleClients), args, tenancyOcid)
 	if err != nil {
 		utils.Logln(err.Error())
diff --git a/internal/resourcediscovery/export_resource_helpers.go b/internal/resourcediscovery/export_resource_helpers.go
@@ -46,8 +46,7 @@ const (
 	StatusPartialSuccess Status = 64
 
 	// parallelism configs
-	ChunkSize         int = 10
-	MaxParallelChunks int = 4
+	ChunkSize int = 10
 )
 
 var isAllDataSourceLock sync.Mutex
diff --git a/website/docs/d/management_agent_management_agent_plugins.html.markdown b/website/docs/d/management_agent_management_agent_plugins.html.markdown
@@ -21,7 +21,11 @@ data "oci_management_agent_management_agent_plugins" "test_management_agent_plug
 	compartment_id = var.compartment_id
 
 	#Optional
+<<<<<<< ours
+	agent_id = oci_cloud_bridge_agent.test_agent.id
+=======
 	agent_id = var.management_agent_id
+>>>>>>> theirs
 	display_name = var.management_agent_plugin_display_name
 	platform_type = var.management_agent_plugin_platform_type
 	state = var.management_agent_plugin_state
diff --git a/website/docs/d/opsi_host_insight.html.markdown b/website/docs/d/opsi_host_insight.html.markdown
@@ -33,11 +33,8 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
-<<<<<<< ours
 * `compute_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Compute Instance
-* `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}` 
-=======
->>>>>>> theirs
+* `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
 * `enterprise_manager_bridge_id` - OPSI Enterprise Manager Bridge OCID
 * `enterprise_manager_entity_display_name` - Enterprise Manager Entity Display Name
 * `enterprise_manager_entity_identifier` - Enterprise Manager Entity Unique Identifier
diff --git a/website/docs/d/opsi_host_insights.html.markdown b/website/docs/d/opsi_host_insights.html.markdown
@@ -39,11 +39,7 @@ The following arguments are supported:
 * `compartment_id_in_subtree` - (Optional) A flag to search all resources within a given compartment and all sub-compartments. 
 * `enterprise_manager_bridge_id` - (Applicable when entity_source=EM_MANAGED_EXTERNAL_HOST) Unique Enterprise Manager bridge identifier
 * `exadata_insight_id` - (Applicable when entity_source=EM_MANAGED_EXTERNAL_HOST) [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of exadata insight resource. 
-<<<<<<< ours
 * `host_type` - (Optional) Filter by one or more host types. Possible values are CLOUD-HOST, EXTERNAL-HOST 
-=======
-* `host_type` - (Optional) Filter by one or more host types. Possible value is EXTERNAL-HOST.
->>>>>>> theirs
 * `id` - (Optional) Optional list of host insight resource [OCIDs](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
 * `platform_type` - (Optional) Filter by one or more platform types. Supported platformType(s) for MACS-managed external host insight: [LINUX, SOLARIS, WINDOWS]. Supported platformType(s) for MACS-managed cloud host insight: [LINUX]. Supported platformType(s) for EM-managed external host insight: [LINUX, SOLARIS, SUNOS, ZLINUX, WINDOWS].
 * `state` - (Optional) Lifecycle states
diff --git a/website/docs/r/database_external_database_connector.html.markdown b/website/docs/r/database_external_database_connector.html.markdown
@@ -35,7 +35,11 @@ resource "oci_database_external_database_connector" "test_external_database_conn
 		protocol = var.external_database_connector_connection_string_protocol
 		service = var.external_database_connector_connection_string_service
 	}
+<<<<<<< ours
+	connector_agent_id = oci_cloud_bridge_agent.test_agent.id
+=======
 	connector_agent_id = oci_database_connector_agent.test_connector_agent.id
+>>>>>>> theirs
 	display_name = var.external_database_connector_display_name
 	external_database_id = oci_database_database.test_database.id
 
diff --git a/website/docs/r/database_vm_cluster_network.html.markdown b/website/docs/r/database_vm_cluster_network.html.markdown
@@ -34,9 +34,12 @@ resource "oci_database_vm_cluster_network" "test_vm_cluster_network" {
 	}
 	vm_networks {
 		#Required
+<<<<<<< ours
+=======
 		domain_name = var.vm_cluster_network_vm_networks_domain_name
 		gateway = var.vm_cluster_network_vm_networks_gateway
 		netmask = var.vm_cluster_network_vm_networks_netmask
+>>>>>>> theirs
 		network_type = var.vm_cluster_network_vm_networks_network_type
 		nodes {
 			#Required
diff --git a/website/docs/r/management_agent_management_agent.html.markdown b/website/docs/r/management_agent_management_agent.html.markdown
@@ -17,7 +17,11 @@ This resource provides the Management Agent resource in Oracle Cloud Infrastruct
 ```hcl
 resource "oci_management_agent_management_agent" "test_management_agent" {
 	#Required
+<<<<<<< ours
+	managed_agent_id = oci_cloud_bridge_agent.test_agent.id
+=======
 	managed_agent_id = oci_management_agent_managed_agent.test_managed_agent.id
+>>>>>>> theirs
 }
 ```
 
diff --git a/website/docs/r/stack_monitoring_discovery_job.html.markdown b/website/docs/r/stack_monitoring_discovery_job.html.markdown
@@ -21,7 +21,11 @@ resource "oci_stack_monitoring_discovery_job" "test_discovery_job" {
 	compartment_id = var.compartment_id
 	discovery_details {
 		#Required
+<<<<<<< ours
+		agent_id = oci_cloud_bridge_agent.test_agent.id
+=======
 		agent_id = var.management_agent_id
+>>>>>>> theirs
 		properties {
 
 			#Optional

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ const (`
`46`	`46`	`StatusPartialSuccess Status = 64`
`47`	`47`
`48`	`48`	`// parallelism configs`
`49`		`- ChunkSize int = 10`
`50`		`- MaxParallelChunks int = 4`
	`49`	`+ ChunkSize int = 10`
`51`	`50`	`)`
`52`	`51`
`53`	`52`	`var isAllDataSourceLock sync.Mutex`