zuul
/
nodepool
Code Issues Proposed changes

Merge "Use seprate log package for NodescanRequest messages"

This commit is contained in:
Zuul 2024-03-05 15:32:18 +00:00 committed by Gerrit Code Review
parent 392cf017c3 65a81ad7b5
commit dfd2877c81
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nodepool/driver/statemachine.py
View File

@ -294,8 +294,7 @@ class StateMachineNodeLauncher(stats.StatsReporter):
self.nodescan_request = NodescanRequest(
node,
label.host_key_checking,
self.manager.provider.boot_timeout,
self.log)
self.manager.provider.boot_timeout)
self.manager.nodescan_worker.addRequest(self.nodescan_request)
except kze.SessionExpiredError:
# Our node lock is gone, leaving the node state as BUILDING.
@ -1240,13 +1239,12 @@ class NodescanRequest:
# For unit testing
FAKE = False
def __init__(self, node, host_key_checking, timeout, log):
def __init__(self, node, host_key_checking, timeout):
self.state = self.START
self.iteration = 'init'
self.node = node
self.host_key_checking = host_key_checking
self.timeout = timeout
self.log = log
self.complete = False
self.keys = []
if (node.connection_type == 'ssh' or
@ -1271,6 +1269,10 @@ class NodescanRequest:
self.exception = None
self.connect_start_time = None
logger = logging.getLogger("nodepool.NodescanRequest")
self.log = get_annotated_logger(logger,
node_id=node.id)
def setWorker(self, worker):
"""Store a reference to the worker thread so we register and unregister
the socket file descriptor from the polling object"""

16
nodepool/tests/unit/test_nodescan.py
View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import logging
from nodepool import tests
from nodepool.nodeutils import iterate_timeout
from nodepool.zk.zookeeper import Node
@ -113,8 +111,7 @@ class TestNodescanWorker(tests.BaseTestCase):
node.connection_port = 22
node.connection_type = 'ssh'
worker.start()
log = logging.getLogger('nodepool.test')
request = NodescanRequest(node, True, 300, log)
request = NodescanRequest(node, True, 300)
worker.addRequest(request)
for _ in iterate_timeout(30, Exception, 'nodescan'):
if request.complete:
@ -141,8 +138,7 @@ class TestNodescanWorker(tests.BaseTestCase):
node.connection_port = 22
node.connection_type = 'ssh'
worker.start()
log = logging.getLogger('nodepool.test')
request = NodescanRequest(node, True, 1, log)
request = NodescanRequest(node, True, 1)
worker.addRequest(request)
for _ in iterate_timeout(30, Exception, 'nodescan'):
if request.complete:
@ -169,8 +165,7 @@ class TestNodescanWorker(tests.BaseTestCase):
node.connection_port = 22
node.connection_type = 'ssh'
worker.start()
log = logging.getLogger('nodepool.test')
request = NodescanRequest(node, True, 1, log)
request = NodescanRequest(node, True, 1)
worker.addRequest(request)
for _ in iterate_timeout(30, Exception, 'nodescan'):
if request.complete:
@ -210,9 +205,8 @@ class TestNodescanWorker(tests.BaseTestCase):
node2.connection_port = 22
node2.connection_type = 'ssh'
log = logging.getLogger('nodepool.test')
request1 = NodescanRequest(node1, True, 300, log)
request2 = NodescanRequest(node2, True, 300, log)
request1 = NodescanRequest(node1, True, 300)
request2 = NodescanRequest(node2, True, 300)
worker.addRequest(request1)
worker.addRequest(request2)
worker.start()