Skip to content
Snippets Groups Projects
Commit 804fa321 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Standardize some common error codes + minor changes. 


Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 38bd2576
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
transfer_service/data_rpc_server.py
+ 24
− 15
View file @ 804fa321
...@@ -49,6 +49,15 @@ class DataRPCServer(RedisRPCServer): ...@@ -49,6 +49,15 @@ class DataRPCServer(RedisRPCServer):
super(DataRPCServer, self).__init__(host, port, db, rpcQueue) super(DataRPCServer, self).__init__(host, port, db, rpcQueue)
def callback(self, requestBody): def callback(self, requestBody):
try:
queueLen = self.pendingQueueWrite.len()
except Exception:
errorMsg = "Cache error."
self.logger.exception(errorMsg)
response = { "responseType": "ERROR",
"errorCode": 3,
"errorMsg": errorMsg }
return response
# 'requestType' and 'userName' attributes are mandatory # 'requestType' and 'userName' attributes are mandatory
if "requestType" not in requestBody or "userName" not in requestBody: if "requestType" not in requestBody or "userName" not in requestBody:
errorMsg = "Malformed request, missing parameters." errorMsg = "Malformed request, missing parameters."
...@@ -56,11 +65,11 @@ class DataRPCServer(RedisRPCServer): ...@@ -56,11 +65,11 @@ class DataRPCServer(RedisRPCServer):
response = { "responseType":"ERROR", response = { "responseType":"ERROR",
"errorCode": 1, "errorCode": 1,
"errorMsg": errorMsg } "errorMsg": errorMsg }
elif self.pendingQueueWrite.len() >= self.maxPendingJobs: elif queueLen >= self.maxPendingJobs:
errorMsg = "Pending queue is full, please, retry later." errorMsg = "Pending queue is full, please, retry later."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 2, "errorCode": 4,
"errorMsg": errorMsg } "errorMsg": errorMsg }
elif requestBody["requestType"] == "CSTORE" or requestBody["requestType"] == "HSTORE": elif requestBody["requestType"] == "CSTORE" or requestBody["requestType"] == "HSTORE":
user = requestBody["userName"] user = requestBody["userName"]
...@@ -70,7 +79,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -70,7 +79,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
try: try:
...@@ -80,14 +89,14 @@ class DataRPCServer(RedisRPCServer): ...@@ -80,14 +89,14 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Multiple users with the same email address in RAP." errorMsg = "Multiple users with the same email address in RAP."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 4, "errorCode": 5,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
except HTTPException: except HTTPException:
errorMsg = "HTTP exception." errorMsg = "HTTP exception."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 5, "errorCode": 6,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
try: try:
...@@ -99,7 +108,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -99,7 +108,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
#folderPath = "/home/" + user + "/store" #folderPath = "/home/" + user + "/store"
...@@ -111,14 +120,14 @@ class DataRPCServer(RedisRPCServer): ...@@ -111,14 +120,14 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "The user does not exist on the transfer node." errorMsg = "The user does not exist on the transfer node."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 6, "errorCode": 7,
"errorMsg": errorMsg } "errorMsg": errorMsg }
elif not (userInDb or rapInfo): elif not (userInDb or rapInfo):
# the user cannot be found neither in RAP nor in db # the user cannot be found neither in RAP nor in db
errorMsg = "The user is not registered neither in RAP nor in the database." errorMsg = "The user is not registered neither in RAP nor in the database."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 7, "errorCode": 8,
"errorMsg": errorMsg } "errorMsg": errorMsg }
else: else:
if not userInDb and rapInfo: if not userInDb and rapInfo:
...@@ -129,7 +138,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -129,7 +138,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
uid = os.stat(folderPath).st_uid uid = os.stat(folderPath).st_uid
...@@ -147,19 +156,19 @@ class DataRPCServer(RedisRPCServer): ...@@ -147,19 +156,19 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "The 'store' directory on the transfer node is empty." errorMsg = "The 'store' directory on the transfer node is empty."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 8, "errorCode": 9,
"errorMsg": errorMsg } "errorMsg": errorMsg }
else: else:
errorMsg = "Service busy. Please, retry later." errorMsg = "Service busy. Please, retry later."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 9, "errorCode": 10,
"errorMsg": errorMsg } "errorMsg": errorMsg }
else: else:
errorMsg = "Permission denied." errorMsg = "Permission denied."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 10, "errorCode": 11,
"errorMsg": errorMsg } "errorMsg": errorMsg }
elif requestBody["requestType"] == "STORE_CON": elif requestBody["requestType"] == "STORE_CON":
username = requestBody["userName"] username = requestBody["userName"]
...@@ -175,7 +184,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -175,7 +184,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
jobObj.jobInfo["storageId"] = requestBody["storageId"] jobObj.jobInfo["storageId"] = requestBody["storageId"]
...@@ -186,7 +195,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -186,7 +195,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Unable to insert the job in the 'write_pending' queue." errorMsg = "Unable to insert the job in the 'write_pending' queue."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 11, "errorCode": 12,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
...@@ -196,7 +205,7 @@ class DataRPCServer(RedisRPCServer): ...@@ -196,7 +205,7 @@ class DataRPCServer(RedisRPCServer):
errorMsg = "Unkown request type." errorMsg = "Unkown request type."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 12, "errorCode": 13,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
......
transfer_service/import_rpc_server.py
+ 7
− 7
View file @ 804fa321
...@@ -70,14 +70,14 @@ class ImportRPCServer(RedisRPCServer): ...@@ -70,14 +70,14 @@ class ImportRPCServer(RedisRPCServer):
except MultipleUsersException: except MultipleUsersException:
errorMsg = "Multiple users with the same email address in RAP." errorMsg = "Multiple users with the same email address in RAP."
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 4,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
except HTTPException: except HTTPException:
errorMsg = "HTTP exception." errorMsg = "HTTP exception."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 4, "errorCode": 5,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
userInfo = self.systemUtils.userInfo(username) userInfo = self.systemUtils.userInfo(username)
...@@ -85,7 +85,7 @@ class ImportRPCServer(RedisRPCServer): ...@@ -85,7 +85,7 @@ class ImportRPCServer(RedisRPCServer):
errorMsg = "The user does not exist on the transfer node." errorMsg = "The user does not exist on the transfer node."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 5, "errorCode": 6,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
elif not (userInDb or rapInfo): elif not (userInDb or rapInfo):
...@@ -93,7 +93,7 @@ class ImportRPCServer(RedisRPCServer): ...@@ -93,7 +93,7 @@ class ImportRPCServer(RedisRPCServer):
errorMsg = "The user is not registered neither in RAP nor in the database." errorMsg = "The user is not registered neither in RAP nor in the database."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 6, "errorCode": 7,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
...@@ -125,7 +125,7 @@ class ImportRPCServer(RedisRPCServer): ...@@ -125,7 +125,7 @@ class ImportRPCServer(RedisRPCServer):
errorMsg = "Invalid storage mount point." errorMsg = "Invalid storage mount point."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 7, "errorCode": 8,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
try: try:
...@@ -134,7 +134,7 @@ class ImportRPCServer(RedisRPCServer): ...@@ -134,7 +134,7 @@ class ImportRPCServer(RedisRPCServer):
errorMsg = "Cache error." errorMsg = "Cache error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 8, "errorCode": 3,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
if not os.path.exists(path): if not os.path.exists(path):
...@@ -191,7 +191,7 @@ class ImportRPCServer(RedisRPCServer): ...@@ -191,7 +191,7 @@ class ImportRPCServer(RedisRPCServer):
errorMsg = "Cache error." errorMsg = "Cache error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 8, "errorCode": 3,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
response = { "responseType": "IMPORT_STARTED" } response = { "responseType": "IMPORT_STARTED" }
......
transfer_service/storage_rpc_server.py
+ 5
− 5
View file @ 804fa321
...@@ -53,7 +53,7 @@ class StorageRPCServer(RedisRPCServer): ...@@ -53,7 +53,7 @@ class StorageRPCServer(RedisRPCServer):
errorMsg = "Base path doesn't exist." errorMsg = "Base path doesn't exist."
self.logger.error(errorMsg) self.logger.error(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 2, "errorCode": 3,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
try: try:
...@@ -65,7 +65,7 @@ class StorageRPCServer(RedisRPCServer): ...@@ -65,7 +65,7 @@ class StorageRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
...@@ -84,7 +84,7 @@ class StorageRPCServer(RedisRPCServer): ...@@ -84,7 +84,7 @@ class StorageRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
...@@ -98,7 +98,7 @@ class StorageRPCServer(RedisRPCServer): ...@@ -98,7 +98,7 @@ class StorageRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
...@@ -117,7 +117,7 @@ class StorageRPCServer(RedisRPCServer): ...@@ -117,7 +117,7 @@ class StorageRPCServer(RedisRPCServer):
errorMsg = "Database error." errorMsg = "Database error."
self.logger.exception(errorMsg) self.logger.exception(errorMsg)
response = { "responseType": "ERROR", response = { "responseType": "ERROR",
"errorCode": 3, "errorCode": 2,
"errorMsg": errorMsg } "errorMsg": errorMsg }
return response return response
else: else:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment