Merge pull request #85 from prometheus/julius-fix-healthstate

Fix target health state update.

retrieval/target.go

@@ -129,6 +129,7 @@ func (t *target) Scrape(earliest time.Time, results chan format.Result) (err err
 		}
 
 		t.scheduler.Reschedule(earliest, futureState)
+		t.state = futureState
 	}()
 
 	done := make(chan bool)

retrieval/target_test.go

@@ -0,0 +1,32 @@
+// Copyright 2013 Prometheus Team
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package retrieval
+
+import (
+	"github.com/prometheus/prometheus/retrieval/format"
+	"testing"
+	"time"
+)
+
+func TestTargetScrapeUpdatesState(t *testing.T) {
+	testTarget := target{
+		scheduler: literalScheduler{},
+		state:     UNKNOWN,
+		address:   "bad schema",
+	}
+	testTarget.Scrape(time.Time{}, make(chan format.Result))
+	if testTarget.state != UNREACHABLE {
+		t.Errorf("Expected target state %v, actual: %v", UNREACHABLE, testTarget.state)
+	}
+}

retrieval/targetpool_test.go

@@ -21,15 +21,6 @@ import (
 	"time"
 )
 
-type literalScheduler time.Time
-
-func (s literalScheduler) ScheduledFor() time.Time {
-	return time.Time(s)
-}
-
-func (s literalScheduler) Reschedule(earliest time.Time, future TargetState) {
-}
-
 func testTargetPool(t test.Tester) {
 	type expectation struct {
 		size int

retrieval/test_helper.go

@@ -0,0 +1,27 @@
+// Copyright 2013 Prometheus Team
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package retrieval
+
+import (
+	"time"
+)
+
+type literalScheduler time.Time
+
+func (s literalScheduler) ScheduledFor() time.Time {
+	return time.Time(s)
+}
+
+func (s literalScheduler) Reschedule(earliest time.Time, future TargetState) {
+}