Merge branch 'master' into f-vault-sighup

hashicorp · Feb 2, 2017 · 37121b4 · 37121b4
2 parents 258ed55 + efc0602
commit 37121b4
Show file tree

Hide file tree

Showing 45 changed files with 6,415 additions and 814 deletions.
diff --git a/client/gc_test.go b/client/gc_test.go
@@ -4,12 +4,20 @@ import (
 	"log"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/nomad/client/stats"
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
+var gcConfig = GCConfig{
+	DiskUsageThreshold:  80,
+	InodeUsageThreshold: 70,
+	Interval:            1 * time.Minute,
+	ReservedDiskMB:      0,
+}
+
 func TestIndexedGCAllocPQ(t *testing.T) {
 	pq := NewIndexedGCAllocPQ()
 
@@ -83,7 +91,7 @@ func (m *MockStatsCollector) Stats() *stats.HostStats {
 
 func TestAllocGarbageCollector_MarkForCollection(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
-	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, 0)
+	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	if err := gc.MarkForCollection(ar1); err != nil {
@@ -98,7 +106,7 @@ func TestAllocGarbageCollector_MarkForCollection(t *testing.T) {
 
 func TestAllocGarbageCollector_Collect(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
-	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, 0)
+	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	_, ar2 := testAllocRunnerFromAlloc(mock.Alloc(), false)
@@ -120,7 +128,7 @@ func TestAllocGarbageCollector_Collect(t *testing.T) {
 
 func TestAllocGarbageCollector_CollectAll(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
-	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, 0)
+	gc := NewAllocGarbageCollector(logger, &MockStatsCollector{}, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	_, ar2 := testAllocRunnerFromAlloc(mock.Alloc(), false)
@@ -143,7 +151,8 @@ func TestAllocGarbageCollector_CollectAll(t *testing.T) {
 func TestAllocGarbageCollector_MakeRoomForAllocations_EnoughSpace(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)
@@ -179,7 +188,8 @@ func TestAllocGarbageCollector_MakeRoomForAllocations_EnoughSpace(t *testing.T)
 func TestAllocGarbageCollector_MakeRoomForAllocations_GC_Partial(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)
@@ -216,7 +226,8 @@ func TestAllocGarbageCollector_MakeRoomForAllocations_GC_Partial(t *testing.T) {
 func TestAllocGarbageCollector_MakeRoomForAllocations_GC_All(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)
@@ -249,7 +260,8 @@ func TestAllocGarbageCollector_MakeRoomForAllocations_GC_All(t *testing.T) {
 func TestAllocGarbageCollector_MakeRoomForAllocations_GC_Fallback(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)
@@ -281,7 +293,8 @@ func TestAllocGarbageCollector_MakeRoomForAllocations_GC_Fallback(t *testing.T)
 func TestAllocGarbageCollector_UsageBelowThreshold(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)
@@ -314,7 +327,8 @@ func TestAllocGarbageCollector_UsageBelowThreshold(t *testing.T) {
 func TestAllocGarbageCollector_UsedPercentThreshold(t *testing.T) {
 	logger := log.New(os.Stdout, "", 0)
 	statsCollector := &MockStatsCollector{}
-	gc := NewAllocGarbageCollector(logger, statsCollector, 20)
+	gcConfig.ReservedDiskMB = 20
+	gc := NewAllocGarbageCollector(logger, statsCollector, &gcConfig)
 
 	_, ar1 := testAllocRunnerFromAlloc(mock.Alloc(), false)
 	close(ar1.waitCh)

diff --git a/demo/vagrant/Vagrantfile b/demo/vagrant/Vagrantfile
@@ -9,7 +9,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y unzip curl wget vim
 # Download Nomad
 echo Fetching Nomad...
 cd /tmp/
-curl -sSL https://releases.hashicorp.com/nomad/0.5.2/nomad_0.5.2_linux_amd64.zip -o nomad.zip
+curl -sSL https://releases.hashicorp.com/nomad/0.5.4/nomad_0.5.4_linux_amd64.zip -o nomad.zip
 
 echo Installing Nomad...
 unzip nomad.zip

diff --git a/nomad/node_endpoint.go b/nomad/node_endpoint.go
@@ -944,6 +944,9 @@ func (n *Node) DeriveVaultToken(args *structs.DeriveVaultTokenRequest,
 	// setErr is a helper for setting the recoverable error on the reply and
 	// logging it
 	setErr := func(e error, recoverable bool) {
+		if e == nil {
+			return
+		}
 		reply.Error = structs.NewRecoverableError(e, recoverable).(*structs.RecoverableError)
 		n.srv.logger.Printf("[ERR] nomad.client: DeriveVaultToken failed (recoverable %v): %v", recoverable, e)
 	}
@@ -1133,7 +1136,7 @@ func (n *Node) DeriveVaultToken(args *structs.DeriveVaultTokenRequest,
 
 		if rerr, ok := createErr.(*structs.RecoverableError); ok {
 			reply.Error = rerr
-		} else {
+		} else if err != nil {
 			reply.Error = structs.NewRecoverableError(createErr, false).(*structs.RecoverableError)
 		}
 

diff --git a/nomad/structs/config/vault_test.go b/nomad/structs/config/vault_test.go
@@ -10,6 +10,7 @@ func TestVaultConfig_Merge(t *testing.T) {
 	c1 := &VaultConfig{
 		Enabled:              &falseValue,
 		Token:                "1",
+		Role:                 "1",
 		AllowUnauthenticated: &trueValue,
 		TaskTokenTTL:         "1",
 		Addr:                 "1",
@@ -24,6 +25,7 @@ func TestVaultConfig_Merge(t *testing.T) {
 	c2 := &VaultConfig{
 		Enabled:              &trueValue,
 		Token:                "2",
+		Role:                 "2",
 		AllowUnauthenticated: &falseValue,
 		TaskTokenTTL:         "2",
 		Addr:                 "2",
@@ -38,6 +40,7 @@ func TestVaultConfig_Merge(t *testing.T) {
 	e := &VaultConfig{
 		Enabled:              &trueValue,
 		Token:                "2",
+		Role:                 "2",
 		AllowUnauthenticated: &falseValue,
 		TaskTokenTTL:         "2",
 		Addr:                 "2",

diff --git a/vendor/github.com/circonus-labs/circonus-gometrics/OPTIONS.md b/vendor/github.com/circonus-labs/circonus-gometrics/OPTIONS.md