From 047eb219e4b97f53dd0c608b8753776074060391 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius.volz@gmail.com>
Date: Mon, 25 Feb 2013 02:52:52 +0100
Subject: [PATCH] Fix target health state update.

Right now, futureState is only used to give hints to the health scheduler, but
nowhere is this future state persisted into the target's state field, so we
don't actually track a target's state over time.
---
 retrieval/target.go          |  1 +
 retrieval/target_test.go     | 32 ++++++++++++++++++++++++++++++++
 retrieval/targetpool_test.go |  9 ---------
 retrieval/test_helper.go     | 27 +++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 retrieval/target_test.go
 create mode 100644 retrieval/test_helper.go

diff --git a/retrieval/target.go b/retrieval/target.go
index b0352bfe7..eef5fe4c1 100644
--- a/retrieval/target.go
+++ b/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)
diff --git a/retrieval/target_test.go b/retrieval/target_test.go
new file mode 100644
index 000000000..b5b051d05
--- /dev/null
+++ b/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)
+	}
+}
diff --git a/retrieval/targetpool_test.go b/retrieval/targetpool_test.go
index 56ca36381..a6ff13d0e 100644
--- a/retrieval/targetpool_test.go
+++ b/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
diff --git a/retrieval/test_helper.go b/retrieval/test_helper.go
new file mode 100644
index 000000000..61f829ea8
--- /dev/null
+++ b/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) {
+}