Merge pull request #42 from janeczku/check-container-state

Include only running/healthy containers
rancher · Jul 27, 2016 · a7280c0 · a7280c0
2 parents 7003e99 + 26dcef8
commit a7280c0
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 16 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/metadata.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/metadata.go
diff --git a/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go
diff --git a/metadata/metadata.go b/metadata/metadata.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	metadataUrl = "http://rancher-metadata/2015-07-25"
+	metadataUrl = "http://rancher-metadata/2015-12-19"
 )
 
 type MetadataClient struct {
@@ -71,7 +71,7 @@ func (m *MetadataClient) getContainersDnsRecords(dnsEntries map[string]utils.Dns
 	}
 
 	for _, container := range containers {
-		if len(container.ServiceName) == 0 {
+		if len(container.ServiceName) == 0 || len(container.Ports) == 0 || !containerStateOK(container) {
 			continue
 		}
 
@@ -84,10 +84,6 @@ func (m *MetadataClient) getContainersDnsRecords(dnsEntries map[string]utils.Dns
 			}
 		}
 
-		if len(container.Ports) == 0 {
-			continue
-		}
-
 		hostUUID := container.HostUUID
 		if len(hostUUID) == 0 {
 			logrus.Debugf("Container's %v host_uuid is empty", container.Name)
@@ -126,3 +122,22 @@ func addToDnsEntries(dnsEntry utils.DnsRecord, dnsEntries map[string]utils.DnsRe
 	dnsEntry = utils.DnsRecord{dnsEntry.Fqdn, records, "A", config.TTL}
 	dnsEntries[dnsEntry.Fqdn] = dnsEntry
 }
+
+func containerStateOK(container metadata.Container) bool {
+	switch container.State {
+	case "starting":
+	case "running":
+	default:
+		return false
+	}
+
+	switch container.HealthState {
+	case "healthy":
+	case "updating-healthy":
+	case "":
+	default:
+		return false
+	}
+
+	return true
+}