Merge pull request #46 from newrelic/lockup

Collect tablespace size concurrently

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.6 - 2019-11-08
+### Fixed
+- Run all DB queries concurrently to avoid deadlock
+
 ## 2.1.5 - 2019-11-07
 ### Fixed
 - Avoid panicking or blocking when inventory connection fails.

src/metrics.go

@@ -19,8 +19,12 @@ func collectMetrics(db *sql.DB, populaterWg *sync.WaitGroup, i *integration.Inte
 	var collectorWg sync.WaitGroup
 	metricChan := make(chan newrelicMetricSender, 100) // large buffer for speed
 
+	// Separate logic is needed to see if we should even collect tablespaces
+	// Collect tablespaces first so the list query completes before other queries are run
+	collectorWg.Add(25)
+	go collectTableSpaces(db, &collectorWg, metricChan)
+
 	// Create a goroutine for each of the metric groups to collect
-	collectorWg.Add(24)
 	go oracleCDBDatafilesOffline.Collect(db, &collectorWg, metricChan)
 	go oraclePDBDatafilesOffline.Collect(db, &collectorWg, metricChan)
 	go oraclePDBNonWrite.Collect(db, &collectorWg, metricChan)
@@ -46,9 +50,6 @@ func collectMetrics(db *sql.DB, populaterWg *sync.WaitGroup, i *integration.Inte
 	go oracleRollbackSegments.Collect(db, &collectorWg, metricChan)
 	go oracleRedoLogWaits.Collect(db, &collectorWg, metricChan)
 
-	// Separate logic is needed to see if we should even collect tablespaces
-	collectTableSpaces(db, &collectorWg, metricChan)
-
 	// When the metric groups are finished collecting, close the channel
 	go func() {
 		collectorWg.Wait()
@@ -142,6 +143,8 @@ const maxTablespaces = 200
 const tablespaceCountQuery = `SELECT count(1) FROM DBA_TABLESPACES WHERE TABLESPACE_NAME <> 'TEMP'`
 
 func collectTableSpaces(db *sql.DB, wg *sync.WaitGroup, metricChan chan<- newrelicMetricSender) {
+	defer wg.Done()
+
 	// Get count from database
 	if tablespaceWhiteList == nil {
 		tablespaceCount, err := queryNumTablespaces(db)
@@ -187,7 +190,6 @@ func queryNumTablespaces(db *sql.DB) (int, error) {
 		if err != nil {
 			return 0, err
 		}
-
 	}
 
 	return count, nil

src/metrics_test.go

@@ -203,7 +203,8 @@ func Test_collectTableSpaces_NoWhitelist_Ok(t *testing.T) {
 	metricChan := make(chan newrelicMetricSender, 10)
 	var collectorWg sync.WaitGroup
 
-	collectTableSpaces(db, &collectorWg, metricChan)
+	collectorWg.Add(1)
+	go collectTableSpaces(db, &collectorWg, metricChan)
 
 	collectorWg.Wait()
 

src/oracledb.go

@@ -31,7 +31,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.oracledb"
-	integrationVersion = "2.1.4"
+	integrationVersion = "2.1.6"
 )
 
 var (
@@ -70,14 +70,12 @@ func main() {
 	instanceLookUp, err := createInstanceIDLookup(db)
 	exitOnErr(err)
 
-	if args.All() {
-		populaterWg.Add(2)
-		go collectMetrics(db, &populaterWg, i, instanceLookUp)
-		go collectInventory(db, &populaterWg, i, instanceLookUp)
-	} else if args.Metrics {
+	if args.HasMetrics() {
 		populaterWg.Add(1)
 		go collectMetrics(db, &populaterWg, i, instanceLookUp)
-	} else if args.Inventory {
+	}
+
+	if args.HasInventory() {
 		populaterWg.Add(1)
 		go collectInventory(db, &populaterWg, i, instanceLookUp)
 	}