diff --git a/src/middlewared/middlewared/plugins/pool_/import_pool.py b/src/middlewared/middlewared/plugins/pool_/import_pool.py index 673279090a23..0fb1efab64ae 100644 --- a/src/middlewared/middlewared/plugins/pool_/import_pool.py +++ b/src/middlewared/middlewared/plugins/pool_/import_pool.py @@ -434,7 +434,7 @@ def import_on_boot(self, job): self.logger.info('Start bring up of NVMe/RoCE') try: jbof_job = self.middleware.call_sync('jbof.configure_job') - jbof_job.wait_sync(timeout=10) + jbof_job.wait_sync(timeout=60) if jbof_job.error: self.logger.error(f'Error attaching JBOFs: {jbof_job.error}') elif jbof_job.result['failed']: @@ -442,7 +442,19 @@ def import_on_boot(self, job): else: self.logger.info(jbof_job.result['message']) except TimeoutError: - self.logger.error('Timed out attaching JBOFs - will continue in background') + self.logger.error('Timed out attaching JBOFs. Waiting again.') + try: + jbof_job.wait_sync(timeout=60) + if jbof_job.error: + self.logger.error(f'Error attaching JBOFs: {jbof_job.error}') + elif jbof_job.result['failed']: + self.logger.error(f'Failed to attach JBOFs:{jbof_job.result["message"]}') + else: + self.logger.info(jbof_job.result['message']) + except TimeoutError: + self.logger.error('Timed out attaching JBOFs - will continue in background.') + else: + self.logger.info('Done bring up of NVMe/RoCE') except Exception: self.logger.error('Unexpected error', exc_info=True)