Merge branch 'ansible-fix'

BBVA · Mar 1, 2019 · 0ce6ffb · 0ce6ffb
2 parents 712d488 + e3fb90e
commit 0ce6ffb
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/balloon/balloon.go b/balloon/balloon.go
@@ -294,12 +294,6 @@ func (b Balloon) QueryDigestMembership(keyDigest hashing.Digest, version uint64)
 func (b Balloon) QueryMembership(event []byte, version uint64) (*MembershipProof, error) {
 	hasher := b.hasherF()
 
-	// Metrics
-	metrics.QedBalloonMembershipTotal.Inc()
-	metrics.QedBalloonDigestMembershipTotal.Dec()
-	//timer := prometheus.NewTimer(metrics.QedBalloonMembershipDurationSeconds)
-	//defer timer.ObserveDuration()
-
 	return b.QueryDigestMembership(hasher.Do(event), version)
 }
 

diff --git a/deploy/aws/provision.sh b/deploy/aws/provision.sh
@@ -30,5 +30,5 @@ then
     ansible-playbook --inventory-file=$(which terraform-inventory) --private-key ~/.ssh/id_rsa_free main.yml -f 10
 else
     echo "Using custom Ansible Playbook command."
-    ansible-playbook "$@"
+    ansible-playbook "$@" --inventory-file=$(which terraform-inventory) --private-key ~/.ssh/id_rsa_free main.yml -f 10
 fi
diff --git a/deploy/aws/provision/files/grafana/dashboards/QED.json b/deploy/aws/provision/files/grafana/dashboards/QED.json
@@ -294,7 +294,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(qed_balloon_membership_total) + sum(qed_balloon_digest_membership_total)",
+          "expr": "sum(qed_balloon_digest_membership_total)",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -525,19 +525,12 @@
       "stack": true,
       "steppedLine": false,
       "targets": [
-        {
-          "expr": "sum(rate(qed_balloon_membership_total[$interval])) by (job)",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{job}}-memb",
-          "refId": "A"
-        },
         {
           "expr": "sum(rate(qed_balloon_digest_membership_total[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}-digest_memb",
-          "refId": "B"
+          "refId": "A"
         }
       ],
       "thresholds": [],

diff --git a/deploy/aws/provision/main.yml b/deploy/aws/provision/main.yml
@@ -24,6 +24,23 @@
     - include: tasks/common/build.yml
     - include: tasks/common/config.yml
 
+- hosts: all
+  remote_user: ec2-user
+  gather_facts: false
+  tasks:
+    - set_fact:
+        host_to_wait_for: "{{ ansible_ssh_host | default(inventory_hostname) }}"
+    - name: waiting for server to be alive
+      wait_for:
+        state: started
+        port: 22
+        host: "{{ host_to_wait_for }}"
+        delay: 10
+        timeout: 300
+        connect_timeout: 300
+        search_regex: OpenSSH
+      delegate_to: localhost
+
 - hosts: all
   remote_user: ec2-user
   become: true
@@ -74,16 +91,28 @@
 
 - hosts: role_qed
   remote_user: ec2-user
+  serial: 1
   become: true
   vars_files:
     - vars.yml
   tasks:
-    - name: Start all services
-      shell: > 
+    - name: Restart all services
+      shell: >
         {{ item }}
       with_items:
+        - /var/qed/qed-stop.sh
         - /var/qed/qed-start.sh
         - /var/qed/exporter-start.sh
+    - name: wait for raised api port
+      wait_for:
+        port: 8800
+    - name: wait for raised mgmt port
+      wait_for:
+        port: 8700
+    - name: wait for raised metrics port
+      wait_for:
+        port: 8600
+
   tags:
     - start-qed
 
@@ -93,10 +122,11 @@
   vars_files:
     - vars.yml
   tasks:
-    - name: Start all services
+    - name: Restart all services
       shell: >
         {{ item }}
       with_items:
+        - /var/qed/qed-stop.sh
         - /var/qed/qed-start.sh
         - /var/qed/exporter-start.sh
   tags:

diff --git a/deploy/aws/provision/templates/qed-start.sh.j2 b/deploy/aws/provision/templates/qed-start.sh.j2
@@ -15,6 +15,8 @@
 #}
 #!/bin/bash
 
+ulimit -n 819200
+
 export QED_HOME=/var/qed
 {% if 'role_qed' in group_names %}
 nohup $QED_HOME/qed start >> $QED_HOME/qed.log 2>&1 &

diff --git a/deploy/aws/provision/templates/qed-stop.sh.j2 b/deploy/aws/provision/templates/qed-stop.sh.j2
@@ -15,4 +15,4 @@
 #}
 #!/bin/bash
 
-killall -9 qed
+killall qed || true