Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Node.start is refactored [Victoria Shepard' ideas are used, #149]#167

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.

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

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
100 changes: 62 additions & 38 deletionstestgres/node.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,48 +790,72 @@ def start(self, params=[], wait=True):
"-w" if wait else '-W', # --wait or --no-wait
"start"] + params # yapf: disable

log_files0 = self._collect_log_files()
assert type(log_files0) == dict # noqa: E721
def LOCAL__start_node():
_, _, error = execute_utility(_params, self.utils_log_file, verbose=True)
assert type(error) == str # noqa: E721
if error and 'does not exist' in error:
raise Exception(error)

nAttempt = 0
timeout = 1
while True:
assert nAttempt >= 0
assert nAttempt < __class__._C_MAX_START_ATEMPTS
nAttempt += 1
def LOCAL__raise_cannot_start_node(from_exception, msg):
assert isinstance(from_exception, Exception)
assert type(msg) == str # noqa: E721
files = self._collect_special_files()
raise_from(StartNodeException(msg, files), from_exception)

def LOCAL__raise_cannot_start_node__std(from_exception):
assert isinstance(from_exception, Exception)
LOCAL__raise_cannot_start_node(from_exception, 'Cannot start node')

if not self._should_free_port:
try:
exit_status, out, error = execute_utility(_params, self.utils_log_file, verbose=True)
if error and 'does not exist' in error:
raise Exception
LOCAL__start_node()
except Exception as e:
assert nAttempt > 0
assert nAttempt <= __class__._C_MAX_START_ATEMPTS
if self._should_free_port and nAttempt < __class__._C_MAX_START_ATEMPTS:
LOCAL__raise_cannot_start_node__std(e)
else:
assert self._should_free_port
assert __class__._C_MAX_START_ATEMPTS > 1

log_files0 = self._collect_log_files()
assert type(log_files0) == dict # noqa: E721

nAttempt = 0
timeout = 1
while True:
assert nAttempt >= 0
assert nAttempt < __class__._C_MAX_START_ATEMPTS
nAttempt += 1
try:
LOCAL__start_node()
except Exception as e:
assert nAttempt > 0
assert nAttempt <= __class__._C_MAX_START_ATEMPTS
if nAttempt == __class__._C_MAX_START_ATEMPTS:
logging.error("Reached maximum retry attempts. Unable to start node.")
LOCAL__raise_cannot_start_node(e, "Cannot start node after multiple attempts")

log_files1 = self._collect_log_files()
if self._detect_port_conflict(log_files0, log_files1):
log_files0 = log_files1
logging.warning(
"Detected an issue with connecting to port {0}. "
"Trying another port after a {1}-second sleep...".format(self.port, timeout)
)
time.sleep(timeout)
timeout = min(2 * timeout, 5)
cur_port = self.port
new_port = utils.reserve_port() # can raise
try:
options = {'port': str(new_port)}
self.set_auto_conf(options)
except: # noqa: E722
utils.release_port(new_port)
raise
self.port = new_port
utils.release_port(cur_port)
continue

msg = 'Cannot start node'
files = self._collect_special_files()
raise_from(StartNodeException(msg, files), e)
break
if not self._detect_port_conflict(log_files0, log_files1):
LOCAL__raise_cannot_start_node__std(e)

log_files0 = log_files1
logging.warning(
"Detected a conflict with using the port {0}. "
"Trying another port after a {1}-second sleep...".format(self.port, timeout)
)
time.sleep(timeout)
timeout = min(2 * timeout, 5)
cur_port = self.port
new_port = utils.reserve_port() # can raise
try:
options = {'port': str(new_port)}
self.set_auto_conf(options)
except: # noqa: E722
utils.release_port(new_port)
raise
self.port = new_port
utils.release_port(cur_port)
continue
break
self._maybe_start_logger()
self.is_started = True
return self
Expand Down
2 changes: 1 addition & 1 deletiontests/test_simple.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1219,7 +1219,7 @@ def test_port_conflict(self):
with self.assertRaises(StartNodeException) as ctx:
node2.init().start()

self.assertIn("Cannot start node", str(ctx.exception))
self.assertIn("Cannot start node after multiple attempts", str(ctx.exception))

self.assertEqual(node2.port, node1.port)
self.assertTrue(node2._should_free_port)
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp