Parcourir la source

AMBARI-6280 - MySQL metrics sink breaks SCOM SQL Server metrics sink

Artem Baranchuk il y a 11 ans
Parent
commit
4e27c5a3f2

+ 3 - 3
contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl

@@ -550,10 +550,10 @@ BEGIN
 			SELECT @recordIDCutoff = MIN(RecordID) FROM MetricRecord WHERE RecordID IN (SELECT TOP 60000 RecordID FROM MetricRecord WHERE NodeID = @nodeID ORDER BY RecordDate DESC);
 			SELECT @recordIDCutoff = MIN(RecordID) FROM MetricRecord WHERE RecordID IN (SELECT TOP 60000 RecordID FROM MetricRecord WHERE NodeID = @nodeID ORDER BY RecordDate DESC);
 			IF @recordIDCutoff IS NOT NULL
 			IF @recordIDCutoff IS NOT NULL
 			BEGIN
 			BEGIN
-				DELETE FROM MetricPair WHERE RecordID IN (
-				SELECT RecordID FROM MetricPair as mp
+				DELETE FROM MetricPair
+				FROM MetricPair as mp
 				JOIN MetricRecord as mr ON mp.RecordID = mr.RecordID
 				JOIN MetricRecord as mr ON mp.RecordID = mr.RecordID
-				WHERE mr.RecordID < @recordIDCutoff AND mr.NodeID = @nodeID);
+				WHERE mr.RecordID < @recordIDCutoff AND mr.NodeID = @nodeID;
 
 
 				DELETE FROM MetricRecord
 				DELETE FROM MetricRecord
 				WHERE RecordID < @recordIDCutoff AND NodeID = @nodeID;
 				WHERE RecordID < @recordIDCutoff AND NodeID = @nodeID;