From e8b92f588d57297d7435d3d230b89c22111cb719 Mon Sep 17 00:00:00 2001
From: "Zhang Rong(Jon)" <rong.zhang@windriver.com>
Date: Sat, 15 Jan 2022 10:31:46 +0800
Subject: [PATCH] Fix: INF-254 o2service cannot recover

1. Change boot order of helm chart, make the sequence like postgres->redis->pubsub->watcher->api.
2. Add the parameter checkfirst for sqlalchemy create metadata.

Issue-ID: INF-254
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: Ib72ceb963d5e1f7e4d7b111cff2ef76710bc4c8a
---
 charts/templates/deployment.yaml | 46 ++++++++++++++++++++--------------------
 o2dms/adapter/orm.py             |  2 +-
 o2ims/adapter/orm.py             |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index 357823e..bdfe964 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -50,40 +50,35 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: o2api
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+        - name: redis
+          image: redis:alpine
           ports:
-            - containerPort: 80
+            - containerPort: 6379
+        - name: o2pubsub
+          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
           env:
-            - name: API_HOST
-              value: api
             - name: DB_HOST
               value: postgres
             - name: DB_PASSWORD
               value: o2ims123
-            - name: FLASK_APP
-              value: /root/o2/o2app/entrypoints/flask_application.py
-            - name: FLASK_DEBUG
-              value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
               value: {{ .Values.o2ims.logginglevel }}
             - name: OS_AUTH_URL
+              value: {{ .Values.ocloud.OS_AUTH_URL }}
             - name: OS_PASSWORD
+              value: {{ .Values.ocloud.OS_PASSWORD }}
             - name: OS_USERNAME
+              value: {{ .Values.ocloud.OS_USERNAME }}
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
-            - name: PYTHONUNBUFFERED
-              value: "1"
             - name: REDIS_HOST
               value: redis
-          command: ["/bin/bash", "/opt/o2api_start.sh"]
+            - name: K8S_KUBECONFIG
+              value: {{ .Values.ocloud.K8S_KUBECONFIG }}
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: redis
-          image: redis:alpine
-          ports:
-            - containerPort: 6379
         - name: watcher
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
           command: ["/bin/bash", "/opt/o2watcher_start.sh"]
@@ -107,28 +102,33 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: o2pubsub
+        - name: o2api
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
-          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
+          ports:
+            - containerPort: 80
           env:
+            - name: API_HOST
+              value: api
             - name: DB_HOST
               value: postgres
             - name: DB_PASSWORD
               value: o2ims123
+            - name: FLASK_APP
+              value: /root/o2/o2app/entrypoints/flask_application.py
+            - name: FLASK_DEBUG
+              value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
               value: {{ .Values.o2ims.logginglevel }}
             - name: OS_AUTH_URL
-              value: {{ .Values.ocloud.OS_AUTH_URL }}
             - name: OS_PASSWORD
-              value: {{ .Values.ocloud.OS_PASSWORD }}
             - name: OS_USERNAME
-              value: {{ .Values.ocloud.OS_USERNAME }}
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
+            - name: PYTHONUNBUFFERED
+              value: "1"
             - name: REDIS_HOST
               value: redis
-            - name: K8S_KUBECONFIG
-              value: {{ .Values.ocloud.K8S_KUBECONFIG }}
+          command: ["/bin/bash", "/opt/o2api_start.sh"]
           volumeMounts:
             - name: scripts
               mountPath: /opt
diff --git a/o2dms/adapter/orm.py b/o2dms/adapter/orm.py
index 6bf5e55..1fa808b 100644
--- a/o2dms/adapter/orm.py
+++ b/o2dms/adapter/orm.py
@@ -98,4 +98,4 @@ def start_o2dms_mappers(engine=None):
     mapper(dmsModel.NfOCloudVResource, nfOCloudVResource)
 
     if engine is not None:
-        metadata.create_all(engine)
+        metadata.create_all(engine, checkfirst=True)
diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index f59a235..0e03727 100644
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -186,4 +186,4 @@ def start_o2ims_mappers(engine=None):
     mapper(confModel.Configuration, configuration)
 
     if engine is not None:
-        metadata.create_all(engine)
+        metadata.create_all(engine, checkfirst=True)
-- 
2.16.6