Merge branch 'master' into qodana

Author: knopers8

common/monitoring/monitoring_test.go

@@ -448,36 +448,36 @@ func TestApproximateHistogram(t *testing.T) {
 		t.Errorf("wrong poolSize, expected 500, got %d", poolSize)
 	}
 
-	if math.Abs(mean-50) > 5 {
-		t.Errorf("wrong mean value, expected 50+-5 got %v", mean)
+	if math.Abs(mean-50) > 10 {
+		t.Errorf("wrong mean value, expected 50+-10 got %v", mean)
 	}
 
-	if math.Abs(float64(median-50)) > 5 {
-		t.Errorf("wrong median value, expected 50+-5 got %v", median)
+	if math.Abs(float64(median-50)) > 10 {
+		t.Errorf("wrong median value, expected 50+-10 got %v", median)
 	}
 
-	if float64(minimum) > 5 {
-		t.Errorf("wrong min value, expected 0+-5 got %v", minimum)
+	if float64(minimum) > 10 {
+		t.Errorf("wrong min value, expected 0+-10 got %v", min)
 	}
 
-	if math.Abs(float64(p10-10)) > 5 {
-		t.Errorf("wrong 10p value, expected 10+-5 got %v", p10)
+	if math.Abs(float64(p10-10)) > 10 {
+		t.Errorf("wrong 10p value, expected 10+-10 got %v", p10)
 	}
 
-	if math.Abs(float64(p30-30)) > 5 {
-		t.Errorf("wrong 30p value, expected 30+-5 got %v", p30)
+	if math.Abs(float64(p30-30)) > 10 {
+		t.Errorf("wrong 30p value, expected 30+-10 got %v", p30)
 	}
 
-	if math.Abs(float64(p70-70)) > 5 {
-		t.Errorf("wrong 50p value, expected 70+-5 got %v", p70)
+	if math.Abs(float64(p70-70)) > 10 {
+		t.Errorf("wrong 50p value, expected 70+-10 got %v", p70)
 	}
 
-	if math.Abs(float64(p90-90)) > 5 {
-		t.Errorf("wrong 90p value, expected 90+-5 got %v", p90)
+	if math.Abs(float64(p90-90)) > 10 {
+		t.Errorf("wrong 90p value, expected 90+-10 got %v", p90)
 	}
 
-	if math.Abs(float64(maximum-100)) > 5 {
-		t.Errorf("wrong max value, expected 100+-5 got %v", maximum)
+	if math.Abs(float64(maximum-100)) > 10 {
+		t.Errorf("wrong max value, expected 100+-10 got %v", max)
 	}
 }
 
@@ -497,33 +497,33 @@ func TestMetricsHistogramObject(t *testing.T) {
 	for _, metric := range metrics {
 		for valueName, value := range metric.fields {
 			if strings.Contains(valueName, "mean") {
-				if math.Abs(value.(float64)-50) > 5 {
-					t.Errorf("wrong mean value, expected 50+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-50) > 10 {
+					t.Errorf("wrong mean value, expected 50+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "median") {
-				if math.Abs(value.(float64)-50) > 5 {
-					t.Errorf("wrong median value, expected 50+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-50) > 10 {
+					t.Errorf("wrong median value, expected 50+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "p10") {
-				if math.Abs(value.(float64)-10) > 5 {
-					t.Errorf("wrong p10, expected 10+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-10) > 10 {
+					t.Errorf("wrong p10, expected 10+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "p30") {
-				if math.Abs(value.(float64)-30) > 5 {
-					t.Errorf("wrong p30, expected 30+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-30) > 10 {
+					t.Errorf("wrong p30, expected 30+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "p70") {
-				if math.Abs(value.(float64)-70) > 5 {
-					t.Errorf("wrong p70, expected 70+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-70) > 10 {
+					t.Errorf("wrong p70, expected 70+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "p90") {
-				if math.Abs(value.(float64)-90) > 5 {
-					t.Errorf("wrong p90, expected 90+-5 got %v", value.(float64))
+				if math.Abs(value.(float64)-90) > 10 {
+					t.Errorf("wrong p90, expected 90+-10 got %v", value.(float64))
 				}
 			}
 			if strings.Contains(valueName, "count") {

core/integration/README.md

@@ -29,6 +29,7 @@ CCDB plugin calls PDP-provided executable which creates a General Run Parameters
 ## DCS
 
 DCS plugin communicates with the ALICE Detector Control System (DCS).
+In particular, it communicates with a gRPC endpoint exposed by `ecs2dcsgateway` (developed by the DCS team), which then passes the requests to the DCS.
 
 ### DCS operations
 
@@ -151,6 +152,23 @@ From the AliECS user point of view, state sequences can be defined as the follow
 - `dcs_sor_state_sequence`
 - `dcs_eor_state_sequence`
 
+#### Testing tips
+
+Typical valid sequences are:
+
+```
+{
+  "dcs_pfr_state_sequence": "1000:RUN_OK",
+  "dcs_sor_state_sequence": "1000:SOR_PROGRESSING,3000:RUN_OK",
+  "dcs_eor_state_sequence": "1000:EOR_PROGRESSING,3000:RUN_OK"
+}
+```
+
+`PFR_AVAILABLE` and `SOR_AVAILABLE` are typically send by DCS via the heartbeat stream, so requesting them as an answer to an operation request does not reflect the behaviour of the production system.
+
+To trigger a `TIMEOUT` event, one should not request a `TIMEOUT` state in the sequence, but rather put a too long delay compared to the provided gRPC timeout.
+Both in the production and the mock setup, `TIMEOUT` events are generated by `ecs2dcsgateway` when a detector does not respond to a request within the specified timeout.
+
 ## DD Scheduler
 
 DD scheduler plugin informs the Data Distribution software about the pool of FLPs taking part in data taking.

docs/development.md

@@ -8,11 +8,26 @@ Bugs go to [JIRA](https://its.cern.ch/jira/projects/OCTRL/issues).
 
 ## Release Procedure
 
+### Major releases
+
 1. Update documentation if necessary.
 2. Bump `VERSION` file, commit, push (or pull request).
-3. Run `hacking/release_notes.sh HEAD` to get a formatted commit message list since the last tag, copy it.
-4. Paste the above into a [new GitHub release draft](https://github.com/AliceO2Group/Control/releases/new). Sort, categorize, add summary on top.
-5. Pick a version number. Numbers `x.x.80`-`x.x.89` are reserved for Alpha pre-releases. Numbers `x.x.90`-`x.x.99` are reserved for Beta and RC pre-releases. If doing a pre-release, don't forget to tick `This is a pre-release`. When ready, hit `Publish release`.
-6. Go to your local clone of `alidist`, ensure that the branch is `master` and that it's up to date. Then branch out into `aliecs-bump` (`git branch aliecs-bump`).
-7. Bump the version in `control.sh`, `control-core.sh`, `control-occplugin.sh` and `coconut.sh`. Commit and push to `origin/aliecs-bump` (`git push -u origin aliecs-bump`).
-8. Submit pull request with the above to `alisw/alidist`.
+3. Go to a [new GitHub release draft](https://github.com/AliceO2Group/Control/releases/new). Use "Generate release notes" to create a list of changes. Write a short summary at the top.
+4. Go to your local clone of `alidist`, ensure that the branch is `master` and that it's up to date. Then branch out into `aliecs-bump` (`git branch aliecs-bump`).
+5. Bump the version in `control.sh`, `control-core.sh`, `control-occplugin.sh` and `coconut.sh`. Commit and push to `origin/aliecs-bump` (`git push -u origin aliecs-bump`).
+6. Submit pull request with the above to `alisw/alidist`.
+
+### Patch releases
+
+1. Update documentation if necessary.
+2. If the patch release should NOT be based on master:
+
+  * Checkout the tag which the patch release should be based on, e.g. `git checkout v1.34.0`
+  * Create a branch called `branch_<planned_tag>`, e.g. `git checkout -b branch_v1.34.1`.
+
+3. Bump `VERSION` file, commit, push (or pull request).
+4. Go to a [new GitHub release draft](https://github.com/AliceO2Group/Control/releases/new). Use "Generate release notes" to create a list of changes. Write a short summary at the top.
+5. Go to your local clone of `alidist`, ensure that the branch is `master` and that it's up to date. Then branch out into `aliecs-bump` (`git branch aliecs-bump`).
+6. Bump the version in `control.sh`, `control-core.sh`, `control-occplugin.sh` and `coconut.sh`. Commit and push to `origin/aliecs-bump` (`git push -u origin aliecs-bump`).
+7. Submit pull request with the above to `alisw/alidist`.
+