Skip to content

Hpe 3par : add abnormal judgment #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuanyu-ghca wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hpe 3par : add abnormal judgment #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6df7297
增加异常判断
yuanyu-ghca Dec 29, 2022
556d263
增加异常判断
yuanyu-ghca Dec 29, 2022
81b5a4a
Merge pull request #623 from yuanyu-ghca/hpe_3par_20221228
yuanyu-ghca Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion delfin/drivers/hpe/hpe_3par/rest_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,22 @@ def login(self):
{"url": url, "reason": res.text})
if 'invalid username or password' in res.text:
raise exception.InvalidUsernameOrPassword()
elif 'maximum number of server connections' in res.text:
raise exception.StorageMaxUserCountException(res.text)
else:
raise exception.StorageBackendException(
six.text_type(res.text))
else:
LOG.error('Login Parameter error')

return access_session
except exception.DelfinException as e:
err_msg = "Login error: %s" % (e.msg)
LOG.error(err_msg)
raise e
except Exception as e:
LOG.error("Login error: %s", six.text_type(e))
raise e
raise exception.StorageBackendException(six.text_type(e))
finally:
self.session_lock.release()

Expand Down
2 changes: 1 addition & 1 deletion delfin/drivers/hpe/hpe_3par/ssh_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ def exec_command(self, command):
raise NotImplementedError(re)
elif 'Too many local CLI connections' in re:
LOG.error("command %s failed: %s" % (command, re))
raise exception.StorageBackendException(re)
raise exception.StorageMaxUserCountException(re)
return re

def get_volumes(self):
Expand Down
6 changes: 5 additions & 1 deletion delfin/drivers/utils/rest_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ def do_call(self, url, data, method,
raise exception.InvalidIpOrPort()
elif 'Read timed out' in str(err):
raise exception.StorageBackendException(six.text_type(err))
elif 'ConnectionResetError(10054' in str(err):
raise exception.StorageMaxUserCountException(str(err))
elif 'maximum number of server connections' in str(err):
raise exception.StorageMaxUserCountException(str(err))
else:
raise exception.BadResponse()
raise exception.StorageBackendException(str(err))

return res