Merge branch 'f-ui/poststart-poststop' of github.com:hashicorp/nomad …

…into f-ui/poststart-poststop

.circleci/config/commands/install-consul.yml

@@ -1,7 +1,7 @@
 parameters:
   version:
     type: string
-    default: 1.6.4
+    default: 1.8.3
 steps:
   - run:
       name: Install Consul << parameters.version >>

CHANGELOG.md

@@ -3,14 +3,25 @@
 IMPROVEMENTS:
 
  * api: Added node purge SDK functionality. [[GH-8142](https://github.com/hashicorp/nomad/issues/8142)]
+ * csi: Improved the accuracy of plugin `Expected` allocation counts. [[GH-8699](https://github.com/hashicorp/nomad/pull/8699)]
  * driver/docker: Allow configurable image pull context timeout setting. [[GH-5718](https://github.com/hashicorp/nomad/issues/5718)]
+ * ui: Added exec keepalive heartbeat. [[GH-8759](https://github.com/hashicorp/nomad/pull/8759)]
+
+BUG FIXES:
+
+ * core: Fixed a bug where unpromoted job versions are used when rescheduling failed allocations [[GH-8691](https://github.com/hashicorp/nomad/issues/8691)]
+ * core: Fixed bugs where scaling policies could be matched against incorrect jobs with a similar prefix [[GH-8753](https://github.com/hashicorp/nomad/issues/8753)]
+ * core: Fixed a bug where garbage collection evaluations that failed or spanned leader elections would be re-enqueued forever. [[GH-8682](https://github.com/hashicorp/nomad/issues/8682)]
+ * core (Enterprise): Fixed a bug where enterprise servers may self-terminate as licenses are ignored after a Raft snapshot restore. [[GH-8737](https://github.com/hashicorp/nomad/issues/8737)]
+ * csi: Fixed a bug where querying CSI volumes would cause a panic if an allocation that claimed the volume had been garbage collected but the claim was not yet dropped. [[GH-8735](https://github.com/hashicorp/nomad/issues/8735)]
+ * deployments (Enterprise): Fixed a bug where counts could not be changed in the web UI for multiregion jobs. [[GH-8685](https://github.com/hashicorp/nomad/issues/8685)]
+ * deployments (Enterprise): Fixed a bug in multi-region deployments where a region that was dropped from the jobspec was not deregistered. [[GH-8763](https://github.com/hashicorp/nomad/issues/8763)]
 
 ## 0.12.3 (August 13, 2020)
 
 BUG FIXES:
 
  * csi: Fixed a panic in the API affecting both plugins and volumes. [[GH-8655](https://github.com/hashicorp/nomad/issues/8655)]
- * core (Enterprise): Fixed a bug where enterprise servers may self-terminate as licenses are ignored after a Raft snapshot restore. [[GH-8737](https://github.com/hashicorp/nomad/issues/8737)]
 
 ## 0.12.2 (August 12, 2020)
 

GNUmakefile

@@ -196,7 +196,7 @@ $(git-dir)/hooks/%: dev/hooks/%
 check: ## Lint the source code
 	@echo "==> Linting source code..."
 	@golangci-lint run -j 1
-	
+
 	@echo "==> Linting hclog statements..."
 	@hclogvet .
 
@@ -214,6 +214,14 @@ check: ## Lint the source code
 	@echo "==> Check API package is isolated from rest"
 	@cd ./api && if go list --test -f '{{ join .Deps "\n" }}' . | grep github.com/hashicorp/nomad/ | grep -v -e /vendor/ -e /nomad/api/ -e nomad/api.test; then echo "  /api package depends the ^^ above internal nomad packages.  Remove such dependency"; exit 1; fi
 
+	@echo "==> Checking Go mod.."
+	@GO111MODULE=on go mod tidy
+	@if (git status --porcelain | grep -Eq "go\.(mod|sum)"); then \
+		echo go.mod or go.sum needs updating; \
+		git --no-pager diff go.mod; \
+		git --no-pager diff go.sum; \
+		exit 1; fi
+
 .PHONY: checkscripts
 checkscripts: ## Lint shell scripts
 	@echo "==> Linting scripts..."

api/internal/testutil/server.go

@@ -97,10 +97,16 @@ type ServerConfigCallback func(c *TestServerConfig)
 // with all of the listen ports incremented by one.
 func defaultServerConfig(t testing.T) *TestServerConfig {
 	ports := freeport.GetT(t, 3)
+
+	logLevel := "DEBUG"
+	if envLogLevel := os.Getenv("NOMAD_TEST_LOG_LEVEL"); envLogLevel != "" {
+		logLevel = envLogLevel
+	}
+
 	return &TestServerConfig{
 		NodeName:          fmt.Sprintf("node-%d", ports[0]),
 		DisableCheckpoint: true,
-		LogLevel:          "DEBUG",
+		LogLevel:          logLevel,
 		Ports: &PortsConfig{
 			HTTP: ports[0],
 			RPC:  ports[1],

api/nodes.go

@@ -568,6 +568,7 @@ type CSIControllerInfo struct {
 // as plugin health changes on the node.
 type CSIInfo struct {
 	PluginID                 string
+	AllocID                  string
 	Healthy                  bool
 	HealthDescription        string
 	UpdateTime               time.Time