Fnndsc master

openshift/pfcon-openshift-template.json

@@ -44,14 +44,10 @@
             "containers": [{
               "command": [
                 "/usr/local/bin/pfcon",
-                "--forever",
-                "--httpResponse",
-                "--swift-storage",
-                "--createDirsAsNeeded",
-                "--enableTokenAuth",
-                "--tokenPath=/etc/pfcon/auth/pfcon_config.cfg"
+                "--verbosity=5",
+                "--port=5005"
               ],
-              "image": "fnndsc/pfcon",
+              "image": "ghcr.io/sandip117/pfcon:flask",
               "imagePullPolicy": "Always",
               "name": "pfcon",
               "ports": [{
@@ -69,36 +65,76 @@
                 }
               },
               "terminationMessagePath": "/dev/termination-log",
-              "volumeMounts": [
+              "volumeMounts": [{
+                  "name": "kubecfg-volume",
+                  "mountPath": "/tmp/.kube/",
+                  "readOnly": true
+                },
+                {
+                "name": "gluster-vol1",
+                "mountPath": "/tmp"
+              },
                 {
                   "mountPath": "/etc/swift",
                   "name": "swift-credentials",
                   "readOnly": true
                 },
                 {
-                  "name": "pfcon-config",
-                  "mountPath": "/etc/pfcon/auth",
-                  "readOnly": true
+                            "mountPath": "/local",
+                            "name": "local-volume"
+                }
+              ],
+              "env": [{
+                  "name": "KUBECFG_PATH",
+                  "value": "/tmp/.kube/config"
+                },
+                {
+                  "name": "OPENSHIFTMGR_PROJECT",
+                  "value": "test-moc"
+                },
+                {
+                  "name": "COMPUTE_SERVICE_URL",
+                  "value": "http://pman-test-moc.k-apps.osh.massopen.cloud/api/v1/"
+                },
+                {
+                  "name": "STORE_ENV",
+                  "value": "swift"
+                },
+                {
+                  "name":"APPLICATION_MODE",
+                  "value":"local"
                 }
               ]
+
             }],
             "dnsPolicy": "ClusterFirst",
             "restartPolicy": "Always",
             "terminationGracePeriodSeconds": 30,
-            "volumes": [
+            "volumes": [{
+                "name": "kubecfg-volume",
+                "secret": {
+                  "secretName": "kubecfg"
+                }
+              },
+              {
+              "name": "gluster-vol1",
+              "persistentVolumeClaim": {
+                "claimName": "gluster1"
+              }
+            },
               {
                 "name": "swift-credentials",
                 "secret": {
                   "defaultMode": 420,
                   "secretName": "swift-credentials"
                 }
               },
-              {
-                "name": "pfcon-config",
-                "secret": {
-                  "secretName": "pfcon-config"
+                {
+                    "name": "local-volume",
+                    "emptyDir": {}
                 }
-            }]
+            ]
+
           }
         },
         "test": false,

pfcon/config.py

@@ -1,6 +1,7 @@
 
 from logging.config import dictConfig
 from environs import Env
+import os
 
 
 class Config:
@@ -17,7 +18,7 @@ def __init__(self):
         env = Env()
         env.read_env()  # also read .env file, if it exists
 
-        self.STORE_ENV = env('STORE_ENV', 'mount')
+        self.STORE_ENV = env('STORE_ENV', 'mount') or os.environ.get('STORE_ENV')
         if self.STORE_ENV == 'mount':
             self.STORE_BASE = '/home/localuser/storeBase'
 
@@ -73,8 +74,9 @@ def __init__(self):
         })
 
         # EXTERNAL SERVICES
-        self.COMPUTE_SERVICE_URL = 'http://pman:5010/api/v1/'
-
+        self.COMPUTE_SERVICE_URL = os.environ.get('COMPUTE_SERVICE_URL') if os.environ.get('COMPUTE_SERVICE_URL') is not None \
+                                   else 'http://pman:5010/api/v1/'
+
 
 class ProdConfig(Config):
     """

pfcon/resources.py

@@ -8,7 +8,7 @@
 
 from .services import PmanService, ServiceException
 from .mount_dir import MountDir
-
+from .swift_store import SwiftStore
 
 logger = logging.getLogger(__name__)
 
@@ -70,7 +70,13 @@ def post(self):
                 logger.error(f'Error while decompressing and storing job {job_id} data, '
                              f'detail: {str(e)}')
                 abort(400, message='data_file: Bad zip file')
-            logger.info(f'Successfully stored job {job_id} input data')
+
+        if self.store_env == 'swift':
+            os.makedirs(f'/tmp/key-{job_id}/outgoing',exist_ok=True)
+            swift = SwiftStore(app.config)
+            d_info = swift.storeData(job_id, "", request.files['data_file'])
+
+        logger.info(f'Successfully stored job {job_id} input data')
 
         # process compute
         compute_data = {
@@ -119,6 +125,10 @@ def get(self, job_id):
         }
 
     def delete(self, job_id):
+        if self.store_env == 'swift':
+            job_dir = "/tmp/key-"+job_id
+            swift = SwiftStore(app.config)
+            swift.deleteData(job_dir)
         if self.store_env == 'mount':
             storebase = app.config.get('STORE_BASE')
             job_dir = os.path.join(storebase, 'key-' + job_id)
@@ -159,4 +169,12 @@ def get(self, job_id):
             logger.info(f'Retrieving job {job_id} output data')
             content = mdir.get_data(job_id, outgoing_dir)
             logger.info(f'Successfully retrieved job {job_id} output data')
+
+        if self.store_env == 'swift':
+
+            swift = SwiftStore(app.config)
+            logger.info(f'Retrieving job {job_id} output data')
+
+            content = swift.getData(job_id, "")
+            logger.info(f'Successfully retrieved job {job_id} output data')
         return Response(content, mimetype='application/zip')