Commit a0b0c4ed authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Fixed conflict with pasture branch. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parents 414e128d c397c93c

README.md

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Further documentation on the VOSpace implementation can be found [here](https:// 
### Main features



- Recursive scan, checksum calculation and .tar generation for data provided by users

- Data transfer operations from and to hot and cold storage points

- Database interaction for storing and retrieving information about VOSpace nodes, jobs, storage points and users

- Simple FCFS (First Come First Served) scheduling mechanism for jobs based on Redis lists

- Set of command line tools to simplify the administrator interaction with the backend architecture.

client/config.py

+2 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python



from configparser import ConfigParser, ExtendedInterpolation

client/vos_data

+2 −4
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ DESCRIPTION 
                    sys.exit("\nFATAL: Malformed response, storage confirmation expected.\n")

                elif confirmResponse["responseType"] == "STORE_RUN":

                    jobId = confirmResponse["jobId"]

                    print()

                    print(f"JobID: {jobId}")

                    print("Storage process started successfully!")

                    print()

                    print(f"\nJobID: {jobId}")

                    print("Storage process started successfully!\n")

                else:

                    sys.exit("FATAL: Unknown response type.\n")

            else:

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ services: 
    volumes:

      - local:/home

      - hot_storage:/mnt/hot_storage/users/

      - "/root/.ssh:/root/.ssh"

      - "/home/cristiano/.ssh:/root/.ssh"

    build: ./transfer_service

    container_name: transfer_service

    depends_on:

transfer_service/abort_job_amqp_server.py

+6 −3
Original line number Diff line number Diff line 
#!/usr/bin/env python



from amqp_server import AMQPServer

from db_connector import DbConnector

from config import Config
@@ -13,13 +15,14 @@ class AbortJobAMQPServer(AMQPServer): 
                                  self.params["password"], 

                                  self.params["host"], 

                                  self.params.getint("port"), 

                                  self.params["db"])

                                  self.params["db"],

                                  8,

                                  16)

        super(AbortJobAMQPServer, self).__init__(host, port, queue)      



    def execute_callback(self, requestBody):

        self.dbConn.connect()

        #TODO

        # do something...

        self.dbConn.disconnect()

        return 42

      

    def run(self):