Merge pull request #53 from supermeng/master

Added pod status histories

Author: bibaijin

apis/models.py

@@ -116,6 +116,29 @@ def podgroup_status(self, name):
                     return None
         return None
 
+    def podgroup_status_history(self, procname, instance):
+        for pg in self.app_spec.PodGroups:
+            if pg.Name.split('.')[2] == procname:
+                r = self.default_deploy.get_podhistory(pg.Name, int(instance))
+                if r.status_code < 400:
+                    status_histories = r.json()
+                    for history in status_histories:
+                        image, node = history['from'].split(' ')
+                        history['image'] = image.split('/')[1]
+                        history['node'] = node[5:]  # len('node:')
+                        del history['from']
+                    status_histories.reverse()
+                    return {
+                        'Name': pg.Name,
+                        'Instance': instance,
+                        'StatusHistory': status_histories
+                    }
+                else:
+                    logger.warning(
+                        "fail getting PodGroup status history: %s" % r.content)
+                    return None
+        return None
+
     def dependency_status(self, name):
         r = self.default_deploy.get_dependency(name)
         if r.status_code < 400:
@@ -524,6 +547,11 @@ def podgroup_remove(self, podgroup_name):
                     (podgroup_name, self.appname))
         return self.default_deploy.remove_podgroup(podgroup_name)
 
+    def podgroup_operate(self, podgroup_name, instance, optype):
+        logger.info("operate podgroup %s of app %s " %
+                    (podgroup_name, self.appname))
+        return self.default_deploy.operate_podgroup(podgroup_name, instance, optype)
+
     def dependency_register(self, service_app, service_appname, dependency_pod_name):
         # service may not been deployed yet, so may need force generate the
         # calico profile of service_profile

apis/utils.py

@@ -20,6 +20,8 @@
 from log import logger
 from .calico import (calico_profile_rule_add)
 import pycalico.datastore_datatypes
+from django.utils.dateparse import parse_datetime
+from pytz import timezone
 
 
 def read_from_etcd(key):
@@ -221,9 +223,21 @@ def get_current_time():
     return strftime("%Y-%m-%d %H:%M:%S", gmtime())
 
 
-def convert_time_from_deployd(d_time):
+def orc_convert_time_from_deployd(d_time):
     c_times = d_time.split("T")
     if len(c_times) <= 1:
         return d_time
     else:
         return "%s %s" % (c_times[0], c_times[1].split('.')[0])
+
+
+def convert_time_from_deployd(d_time):
+    t_time = parse_datetime(d_time)
+    tzchina = timezone('Asia/Shanghai')
+    utc = timezone('UTC')
+    t_time = t_time.replace(tzinfo=utc).astimezone(tzchina)
+    try:
+        return t_time.strftime('%Y-%m-%d %H:%M:%S')
+    except Exception as e:
+        logger.error("strftime error:%s d_time:%s", str(e), d_time)
+    return orc_convert_time_from_deployd(t_time)

apis/views.py

@@ -952,6 +952,31 @@ def get_app_proc(cls, appname, procname, options=None):
                         appname, procname, e),
                     reverse('api_procs', kwargs={'appname': appname}))
 
+    @classmethod
+    def get_proc_history(cls, appname, procname, instance, options=None):
+        try:
+            app = App.get_or_none(appname)
+            if not app.is_reachable():
+                return (404, None,
+                        'app with appname %s has not been deployd\n' % appname,
+                        reverse('api_apps'))
+            status_history = app.podgroup_status_history(procname, instance)
+            if status_history:
+                return (200, status_history,
+                        '', reverse('api_proc_history',
+                                    kwargs={'appname': appname, 'procname': procname, 'instance': instance}))
+            else:
+                return (200, [],
+                        'proc %s do not exists' % (procname),
+                        reverse('api_proc_history',
+                                kwargs={'appname': appname, 'procname': procname, 'instance': instance}))
+        except Exception, e:
+            client.captureException()
+            return (500, None,
+                    'fatal error when get app %s proc %s:\n%s\nplease contact with admin of lain\n' % (
+                        appname, procname, e),
+                    reverse('api_procs', kwargs={'appname': appname}))
+
     @classmethod
     def update_app_proc(cls, appname, procname, options):
         def verify_options(options):
@@ -1104,6 +1129,59 @@ def delete_app_proc(cls, appname, procname, options=None):
                         appname, procname, e),
                     reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
+    @classmethod
+    def operate_proc(cls, appname, procname, operation, options=None):
+        try:
+            instance = int(options.get('instance', 0))
+            app = App.get_or_none(appname)
+            if not app.is_reachable():
+                return (404, None,
+                        'app with appname %s has not been deployd\n' % appname,
+                        reverse('api_apps'))
+            proc, pg_status = app.proc_and_pg_status(procname)
+            if proc is None:
+                return (404, None,
+                        'no such proc %s in app %s' % (procname, appname),
+                        reverse('api_procs', kwargs={'appname': appname}))
+            if pg_status:
+                container_name = None
+                if instance != 0:
+                    pods = pg_status['Status']['Pods']
+                    if instance <= len(pods):
+                        container_name = pods[
+                            instance - 1]['Containers'][0]['Runtime']['Name']
+                    else:
+                        return (404, None, 'no such proc %s instance %d, in app %s' % (procname, instance, appname),
+                                reverse('api_procs', kwargs={'appname': appname}))
+                if container_name:
+                    add_oplog(AuthApi.operater, operation.upper(), appname, "",
+                              "%s container %s" % (operation, container_name))
+                else:
+                    add_oplog(AuthApi.operater, operation.upper(), appname, "",
+                              "%s proc %s" % (operation, procname))
+
+                podgroup_name = "%s.%s.%s" % (
+                    appname, proc.type.name, proc.name)
+                result = app.podgroup_operate(podgroup_name, instance, operation)
+                if result.status_code < 400:
+                    return (202, ProcApi.render_proc_data(appname, proc),
+                            render_op_result_to_msg(result),
+                            reverse('api_procs', kwargs={'appname': appname}))
+                else:
+                    return (500, ProcApi.render_proc_data(appname, proc),
+                            render_op_result_to_msg(result),
+                            reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
+            else:
+                return (400, ProcApi.render_proc_data(appname, proc),
+                        'proc %s exists but not deployed\nplease deploy it first\n' % (
+                            procname),
+                        reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
+        except Exception, e:
+            client.captureException()
+            return (500, None,
+                    'fatal error when %s app %s proc %s:\n%s\nplease contact with admin of lain\n' % (
+                        operation, appname, procname, e),
+                    reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
 '''
 这个类响应 console.views 关于 maintainer 的所有调用
@@ -1420,6 +1498,14 @@ def gen_release_image(cls, app, base_image, config_tag, config_layer_count):
                 app.appname, config_tag, config_layer_count, target_repo, target_tag)
         return "%s:%s-%s" % (target_repo, target_tag, config_tag)
 
+    @classmethod
+    def list_ports(cls):
+        resp = Streamrouter.get_streamrouter_ports()
+        if resp == None:
+            return (400, None, '', reverse('api_streamrouter'))
+        else:
+            return (200, resp, '', reverse('api_streamrouter'))
+
 
 class StreamrouterApi:
 

console/urls.py

@@ -18,6 +18,9 @@
     url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/procs/(?P<procname>[^/]+)/$',
         'console.views.api_proc', name='api_proc'),
 
+    url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/procs/(?P<procname>[^/]+)/instance/(?P<instance>[^/]+)/histories/$',
+        'console.views.api_proc_history', name='api_proc_history'),
+
     # authroze service for console ui
     url(r'^(?:api/)?v1/authorize/$',
         'console.views.api_authorize', name='api_authorize'),

console/views.py

@@ -210,6 +210,23 @@ def api_proc(request, appname, procname):
         _invalid_request_method('proc', request.method)
 
 
+def api_proc_history(request, appname, procname, instance):
+    if request.method == 'GET':
+        return api_proc_history_get(request, appname, procname, instance)
+    else:
+        _invalid_request_method('proc history', request.method)
+
+
+@permission_required('maintain')
+def api_proc_history_get(request, appname, procname, instance):
+    try:
+        status_code, view_object, msg, url = ProcApi.get_proc_history(
+            appname, procname, instance)
+        return render_json_response(status_code, 'proc', view_object, msg, url)
+    except Exception:
+        return render_json_response(400, 'proc history', None, 'invalid request: should be json body with procname(detail string) instance(int)', reverse('api_docs'))
+
+
 @permission_required('maintain')
 @deployd_required
 def api_proc_high_permit(request, appname, procname):
@@ -220,10 +237,16 @@ def api_proc_high_permit(request, appname, procname):
     elif request.method == 'PATCH':
         try:
             options = json.loads(request.body)
+            operation = options.get('operation', 'schedule')
+            if operation == 'schedule':
+                status_code, view_object, msg, url = ProcApi.update_app_proc(
+                    appname, procname, options)
+            else:
+                status_code, view_object, msg, url = ProcApi.operate_proc(
+                    appname, procname, operation, options)
         except Exception:
             return render_json_response(400, 'proc', None, 'invalid request: should be json body with num_instances(integer) or cpu(integer) or memory(str)', reverse('api_docs'))
-        status_code, view_object, msg, url = ProcApi.update_app_proc(
-            appname, procname, options)
+
         return render_json_response(status_code, 'proc', view_object, msg, url)
 
 

deploys/models.py

@@ -28,9 +28,15 @@ def create_podgroup(self, podgroup_json):
     def get_podgroup(self, podgroup_name):
         return deploys.utils.get_podgroup(podgroup_name, self.apiserver)
 
+    def get_podhistory(self, podgroup_name, instance):
+        return deploys.utils.get_podhistory(podgroup_name, instance, self.apiserver)
+
     def remove_podgroup(self, podgroup_name):
         return deploys.utils.remove_podgroup(podgroup_name, self.apiserver)
 
+    def operate_podgroup(self, podgroup_name, instance, operation):
+        return deploys.utils.operate_podgroup(podgroup_name, instance, operation, self.apiserver)
+
     def patch_podgroup_instance(self, podgroup_name, num_instances):
         return deploys.utils.patch_podgroup_instance(podgroup_name, num_instances, self.apiserver)
 

deploys/utils.py

@@ -24,11 +24,24 @@ def get_podgroup(podgroup_name, apiserver):
     return send_request("GET", url, None, None)
 
 
+def get_podhistory(podgroup_name, instance, apiserver):
+    url = "%s/api/cntstatushistory?name=%s&instance=%d" % (
+        apiserver, podgroup_name, instance)
+    return send_request("GET", url, None, None)
+
+
 def remove_podgroup(podgroup_name, apiserver):
     url = "%s/api/podgroups?name=%s" % (apiserver, podgroup_name)
     return send_request("DELETE", url, None, None)
 
 
+def operate_podgroup(podgroup_name, instance, operation, apiserver):
+    url = "%s/api/podgroups?name=%s&instance=%d&cmd=operation&optype=%s" % (
+        apiserver, podgroup_name, instance, operation
+    )
+    return send_request("PATCH", url, None, None)
+
+
 def patch_podgroup_instance(podgroup_name, num_instances, apiserver):
     url = "%s/api/podgroups?name=%s&num_instances=%s&cmd=replica" % (
         apiserver, podgroup_name, num_instances

lain.yaml

@@ -55,4 +55,4 @@ web.console:
     - console_op
 
 notify:
-  slack: "#lain"
+  slack: "#lain"