Skip to content

Value pg_probackup major_version added to the class Init #119

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

Merged
merged 6 commits into from
Apr 10, 2024
Merged

Value pg_probackup major_version added to the class Init #119

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3dc640f
Value pg_probackup major_version added to the class Init
egarbuz Apr 4, 2024
2a0c37b
Add check on digit for probackup_version
egarbuz Apr 8, 2024
5db4ae3
Break when pg_probackup version is incorrect
egarbuz Apr 9, 2024
3a90ecd
Adding print incorrect version
egarbuz Apr 9, 2024
ea05a4a
Correction of remarks
egarbuz Apr 10, 2024
5b8a836
Changed error message
egarbuz Apr 10, 2024
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
6 changes: 6 additions & 0 deletions testgres/plugins/pg_probackup2/pg_probackup2/init_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,12 @@ def __init__(self):
os.environ["PGAPPNAME"] = "pg_probackup"
self.delete_logs = delete_logs

if self.probackup_version.split('.')[0].isdigit:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не .isdigit, а .isdigit(). .isdigit возвращает указатель на метод, который существует у любой строки, поэтому вернёт истинное значение для любой строки:

>>> if 'abc'.isdigit:
...   print('aaa')
... 
aaa

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Поправил, спасибо.

self.major_version = int(self.probackup_version.split('.')[0])
else:
print('Pg_probackup version \"{}\" is not correct!'.format(self.probackup_version))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Сообщение вида

Pg_probackup version "alpha1" is not correct

никак не объясняет пользователю, в чём ошибка и что сделать, чтобы она не возникала. Нужно заменить на что-то вида:

Expected that the major pg_probackup version should be a number, got: "alpha1"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Поправил текст выводимого сообщения об ошибке.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ошибочно утверждать, что версия некорректна, какой вид версии выбрать - это решение исключительно автора продукта. Вопрос здесь в том, что версия имеет не тот вид, который тестгрес ожидает для своей работы. Вариантом могло бы быть:

Can't process pg_probackup version "alpha1": the major version is expected to be a number

Восклицательные знаки, капслок и смайлики лучше не использовать в сообщениях для пользователя.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Обсудили, согласен с доводами.
Заменил на предложенное сообщение.

sys.exit(1)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Можно более безопасные преобразования сделат, на случай если в версии что-то не то будет.Либо не скастится в int либо не будет первого элемента

def test_env(self):
return self._test_env.copy()

Expand Down