Merge pull request #425 from chronicleworks/liveness-probe-helm

Add liveness / startup probe using chronicle import

.github/settings.yml

@@ -124,11 +124,7 @@ branches:
         # this branch
         contexts:
           - DCO
-          - pre-commit
           - Commit Message Lint
-          - License Compliance
-          - cargo-checkmate
-          - continuous-integration/jenkins/pr-head
       # Required. Enforce all configured restrictions for administrators. Set
       # to true to enforce required status checks for repository administrators.
       # Set to null to disable.
@@ -143,11 +139,11 @@ branches:
       restrictions:
 
 autolinks:
-  - key_prefix: 'SXT-'
-    url_template: 'https://blockchaintp.atlassian.net/browse/SXT-<num>'
-  - key_prefix: 'BCP-'
-    url_template: 'https://blockchaintp.atlassian.net/browse/BCP-<num>'
-  - key_prefix: 'CHRON-'
-    url_template: 'https://blockchaintp.atlassian.net/browse/CHRON-<num>'
-  - key_prefix: 'DCP-'
-    url_template: 'https://blockchaintp.atlassian.net/browse/DCP-<num>'
+  - key_prefix: "SXT-"
+    url_template: "https://blockchaintp.atlassian.net/browse/SXT-<num>"
+  - key_prefix: "BCP-"
+    url_template: "https://blockchaintp.atlassian.net/browse/BCP-<num>"
+  - key_prefix: "CHRON-"
+    url_template: "https://blockchaintp.atlassian.net/browse/CHRON-<num>"
+  - key_prefix: "DCP-"
+    url_template: "https://blockchaintp.atlassian.net/browse/DCP-<num>"

charts/chronicle/Chart.yaml

@@ -17,7 +17,7 @@ keywords:
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.1.20
+version: 0.1.21
 
 # This is the version number of Chronicle being deployed. This version
 # number should be incremented each time you make changes to Chronicle.

charts/chronicle/README.md

@@ -58,3 +58,19 @@
 | `postgres.persistence.size` | postgres PVC volume size | string | "40Gi" |
 | `postgres.resources` | resources | map | nil |
 | `resources` | resources | map | nil |
+| `livenessProbe.enabled` | if true, enables the liveness probe | false |
+| `livenessProbe.initialDelaySeconds` | delay before liveness probe is initiated | 30 |
+| `livenessProbe.periodSeconds` | how often to perform the probe | 10 |
+| `livenessProbe.timeoutSeconds` | when the probe times out | 1 |
+| `livenessProbe.failureThreshold` | how many times to retry the probe before giving up | 3 |
+| `livenessProbe.successThreshold` | how many times the probe must report success to be considered successful after having failed | 1 |
+| `livenessProbe.namespaceName` | the namespace name for the liveness probe | "default" |
+| `livenessProbe.namespaceUuid` | the namespace UUID for the liveness probe | "fd717fd6-70f1-44c1-81de-287d5e101089" |
+| `startupProbe.enabled` | if true, enables the startup probe | false |
+| `startupProbe.initialDelaySeconds` | delay before startup probe is initiated | 10 |
+| `startupProbe.periodSeconds` | how often to perform the probe | 10 |
+| `startupProbe.timeoutSeconds` | when the probe times out | 1 |
+| `startupProbe.failureThreshold` | how many times to retry the probe before giving up | 3 |
+| `startupProbe.successThreshold` | how many times the probe must report success to be considered successful after having failed | 1 |
+| `startupProbe.namespaceName` | the namespace name for the startup probe | "default" |
+| `startupProbe.namespaceUuid` | the namespace UUID for the startup probe | "fd717fd6-70f1-44c1-81de-287d5e101089" |

charts/chronicle/templates/statefulset.yaml

@@ -153,6 +153,106 @@ spec:
             - name: chronicle-data
               mountPath: /var/lib/chronicle/store/
             {{- include "lib.volumeMounts" .Values.extraVolumeMounts | nindent 12 }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - bash
+                - -c
+                - |
+                  PROBE_ID="startup_$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 13)" &&
+                  TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ") &&
+                  echo '[
+                    {
+                      "@id": "_:n1",
+                      "@type": [
+                        "http://btp.works/chronicleoperations/ns#ActivityExists"
+                      ],
+                      "http://btp.works/chronicleoperations/ns#activityName": [
+                        {
+                          "@value": "'"$PROBE_ID"'"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceName": [
+                        {
+                          "@value": "{{ .Values.livenessProbe.namespaceName }}"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceUuid": [
+                        {
+                          "@value": "{{ .Values.livenessProbe.namespaceUuid }}"
+                        }
+                      ]
+                    }
+                  ]' > /tmp/import.json &&
+                  echo "Probe ID: $PROBE_ID" &&
+                  chronicle \
+                    -c /etc/chronicle/config/config.toml \
+                    --console-logging json \
+                    --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \
+                    --remote-database \
+                    --database-name {{ .Values.postgres.database }} \
+                    --database-username {{ .Values.postgres.user }} \
+                    --database-host {{ .Values.postgres.host }} \
+                {{- if not .Values.opa.enabled }}
+                    --embedded-opa-policy \
+                {{- end }}
+                    import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} < /tmp/import.json
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.startUpProbe.enabled }}
+          startupProbe:
+            exec:
+              command:
+                - bash
+                - -c
+                - |
+                  PROBE_ID="startup_$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 13)" &&
+                  TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ") &&
+                  echo '[
+                    {
+                      "@id": "_:n1",
+                      "@type": [
+                        "http://btp.works/chronicleoperations/ns#ActivityExists"
+                      ],
+                      "http://btp.works/chronicleoperations/ns#activityName": [
+                        {
+                          "@value": "'"$PROBE_ID"'"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceName": [
+                        {
+                          "@value": "{{ .Values.startUpProbe.namespaceName }}"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceUuid": [
+                        {
+                          "@value": "{{ .Values.startUpProbe.namespaceUuid }}"
+                        }
+                      ]
+                    }
+                  ]' > /tmp/import.json &&
+                  echo "Probe ID: $PROBE_ID" &&
+                  chronicle \
+                    -c /etc/chronicle/config/config.toml \
+                    --console-logging json \
+                    --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \
+                    --remote-database \
+                    --database-name {{ .Values.postgres.database }} \
+                    --database-username {{ .Values.postgres.user }} \
+                    --database-host {{ .Values.postgres.host }} \
+                {{- if not .Values.opa.enabled }}
+                    --embedded-opa-policy \
+                {{- end }}
+                    import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} < /tmp/import.json
+            initialDelaySeconds: {{ .Values.startUpProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startUpProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startUpProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.startUpProbe.failureThreshold }}
+          {{- end }}
       volumes:
         - name: chronicle-secrets
           persistentVolumeClaim:
@@ -163,10 +263,10 @@ spec:
         - name: chronicle-config
           configMap:
             name: {{ .Release.Name }}-chronicle-config
-{{- if not .Values.postgres.persistence.enabled }}
+        {{- if not .Values.postgres.persistence.enabled }}
         - name: "pgdata"
           emptyDir: {}
-{{- end }}
+        {{- end }}
   volumeClaimTemplates:
     - metadata:
         name: chronicle-data
@@ -176,7 +276,7 @@ spec:
         resources:
           requests:
             storage: 6Gi
-{{- if .Values.postgres.persistence.enabled }}
+    {{- if .Values.postgres.persistence.enabled }}
     - metadata:
         name: "pgdata"
         annotations: {{- include "lib.safeToYaml" .Values.postgres.persistence.annotations | nindent 10 }}
@@ -186,4 +286,4 @@ spec:
         resources:
           requests:
             storage: {{ .Values.postgres.persistence.size | quote }}
-{{- end }}
+    {{- end }}

charts/chronicle/values.yaml

@@ -22,6 +22,36 @@ auth:
   userinfo:
     url:
 
+## @md | `livenessProbe.enabled` | if true, enables the liveness probe | false |
+livenessProbe:
+  enabled: false
+  ## @md | `livenessProbe.timeoutSeconds` | number of seconds after which the probe times out | 10 |
+  timeoutSeconds: 20
+  ## @md | `livenessProbe.periodSeconds` | how often (in seconds) to perform the probe | 60 |
+  periodSeconds: 60
+  ## @md | `livenessProbe.failureThreshold` | when a probe fails, Kubernetes will try failureThreshold times before giving up | 1 |
+  failureThreshold: 1
+  ## @md | `livenessProbe.namespaceName` | the Chronicle namespace in which the probe operates | default |
+  namespaceName: default
+  ## @md | `livenessProbe.namespaceUuid` | the UUID of the Chronicle namespace in which the probe operates | fd717fd6-70f1-44c1-81de-287d5e101089 |
+  namespaceUuid: fd717fd6-70f1-44c1-81de-287d5e101089
+
+## @md | `startUpProbe.enabled` | if true, enables the startup probe | true |
+startUpProbe:
+  enabled: false
+  ## @md | `startUpProbe.initialDelaySeconds` | number of seconds after which the probe starts | 5 |
+  initialDelaySeconds: 5
+  ## @md | `startUpProbe.failureThreshold` | when a probe fails, Kubernetes will try failureThreshold times before giving up | 30 |
+  failureThreshold: 30
+  ## @md | `startUpProbe.periodSeconds` | how often (in seconds) to perform the probe | 10 |
+  periodSeconds: 10
+  ## @md | `startUpProbe.timeoutSeconds` | number of seconds after which the probe times out | 3 |
+  timeoutSeconds: 3
+  ## @md | `startUpProbe.namespaceName` | the Chronicle namespace in which the probe operates | default |
+  namespaceName: default
+  ## @md | `startUpProbe.namespaceUuid` | the UUID of the Chronicle namespace in which the probe operates | fd717fd6-70f1-44c1-81de-287d5e101089 |
+  namespaceUuid: fd717fd6-70f1-44c1-81de-287d5e101089
+
 ## @md | `backtraceLevel` | backtrace level for Chronicle  | nil |
 backtraceLevel: full
 
@@ -134,7 +164,7 @@ test:
   ## @md | `test.api` | test the chronicle GraphQL server API |
   api:
     ## @md | `test.api.enabled` | true to enable api-test Jobs and Services | true |
-    enabled: true
+    enabled: false
     ## @md | `test.api.image` | the image to use for the api-test container | blockchaintp/chronicle-helm-api-test |
     image:
       ## @md | `test.api.image.pullPolicy` | the image pull policy | IfNotPresent |

crates/api/src/chronicle_graphql/cursor_query.rs

@@ -34,7 +34,7 @@ where
     T: OutputType,
     I: IntoIterator<Item = (T, i64)>,
 {
-    let rx = Vec::from_iter(rx.into_iter());
+    let rx = Vec::from_iter(rx);
     let mut gql = async_graphql::connection::Connection::new(
         rx.first().map(|(_, _total)| start > 0).unwrap_or(false),
         rx.first()

crates/api/src/lib.rs

@@ -264,7 +264,7 @@ where
         pool.get()?
             .build_transaction()
             .run(|connection| connection.run_pending_migrations(MIGRATIONS).map(|_| ()))
-            .map_err(|migration| StoreError::DbMigration(migration))?;
+            .map_err(StoreError::DbMigration)?;
 
         // Append namespace bindings and system namespace
         store.namespace_binding(

crates/api/src/persistence/mod.rs

@@ -1176,7 +1176,6 @@ impl Store {
             .select(schema::entity::external_id)
             .load::<String>(connection)?
         {
-            let used = used;
             model.used(namespaceid.clone(), &id, &EntityId::from_external_id(used));
         }
 
@@ -1189,7 +1188,6 @@ impl Store {
             .select(schema::activity::external_id)
             .load::<String>(connection)?
         {
-            let wasinformedby = wasinformedby;
             model.was_informed_by(
                 namespaceid.clone(),
                 &id,

crates/async-sawtooth-sdk/src/ledger.rs

@@ -493,7 +493,6 @@ impl<
         }
 
         let channel = self.channel.clone();
-        let from_block = from_block;
         let event_stream = channel.recv_stream::<EventList>().await?;
         let event_stream = event_stream.then(move |events| {
             let event_type = event_type.clone();

crates/chronicle-protocol/src/protocol.rs

@@ -159,8 +159,7 @@ impl messages::Event {
 
 /// `Submission` protocol buffer serializer
 pub fn serialize_submission(submission: &messages::Submission) -> Vec<u8> {
-    let mut buf = Vec::new();
-    buf.reserve(submission.encoded_len());
+    let mut buf = Vec::with_capacity(submission.encoded_len());
     submission.encode(&mut buf).unwrap();
     buf
 }

crates/common/src/prov/model/from_json_ld.rs

@@ -214,7 +214,7 @@ impl ProvModel {
                 map.get(Chronicle::Value.as_iri().as_str())
             {
                 if array.len() == 1 {
-                    let o = array.get(0).unwrap();
+                    let o = array.first().unwrap();
                     let serde_object = &o["@value"];
 
                     if let serde_json::Value::Object(object) = serde_object {