mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-06-29 23:41:12 +08:00
0cd49e14dd
### What problem does this PR solve? Resolve #14137 . ### Problem Graph resolution succeeds (nodes/edges merged, pagerank updated), but the subsequent burst of Infinity write operations in `set_graph` exhausts the connection pool with `TOO_MANY_CONNECTIONS` errors. Root causes: 1. **Hardcoded pool size** — `infinity_conn_pool.py` hardcoded `ConnectionPool(max_size=4)` on initial creation and `max_size=32` on refresh. Operators cannot tune this without patching code. 2. **No retry on transient failures** — a single `TOO_MANY_CONNECTIONS` on edge deletes or chunk inserts kills the entire resolution+community pipeline with no retry. ### Changes #### `common/doc_store/infinity_conn_pool.py` - Read `ConnectionPool` `max_size` from the `INFINITY_POOL_MAX_SIZE` environment variable (default: `4`), applied consistently to both initial creation and refresh paths. - Log the actual pool size on startup for easier debugging. #### `rag/graphrag/utils.py` — `set_graph()` - **Edge deletes**: add exponential-backoff retry (3 attempts, 1s/2s/4s delays) so transient `TOO_MANY_CONNECTIONS` errors are retried instead of failing the entire job. Concurrency continues to be gated by the existing `chat_limiter`. - **Batch inserts**: add exponential-backoff retry (3 attempts, 1s/2s/4s delays) for the same reason. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --------- Signed-off-by: noob <yixiao121314@outlook.com>
121 lines
4.4 KiB
Python
121 lines
4.4 KiB
Python
#
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
import logging
|
|
import os
|
|
import time
|
|
|
|
import infinity
|
|
from infinity.connection_pool import ConnectionPool
|
|
from infinity.errors import ErrorCode
|
|
|
|
from common import settings
|
|
from common.decorator import singleton
|
|
|
|
|
|
@singleton
|
|
class InfinityConnectionPool:
|
|
|
|
def __init__(self):
|
|
if hasattr(settings, "INFINITY"):
|
|
self.INFINITY_CONFIG = settings.INFINITY
|
|
else:
|
|
self.INFINITY_CONFIG = settings.get_base_config("infinity", {
|
|
"uri": "infinity:23817",
|
|
"postgres_port": 5432,
|
|
"db_name": "default_db"
|
|
})
|
|
|
|
raw_pool_max_size = os.environ.get("INFINITY_POOL_MAX_SIZE", "4")
|
|
try:
|
|
self.pool_max_size = int(raw_pool_max_size)
|
|
except ValueError as e:
|
|
raise ValueError("INFINITY_POOL_MAX_SIZE must be a positive integer") from e
|
|
if self.pool_max_size < 1:
|
|
raise ValueError("INFINITY_POOL_MAX_SIZE must be >= 1")
|
|
|
|
infinity_uri = self.INFINITY_CONFIG["uri"]
|
|
if ":" in infinity_uri:
|
|
host, port = infinity_uri.split(":")
|
|
self.infinity_uri = infinity.common.NetworkAddress(host, int(port))
|
|
|
|
self.conn_pool = None
|
|
for _ in range(24):
|
|
conn_pool = None
|
|
inf_conn = None
|
|
try:
|
|
conn_pool = ConnectionPool(self.infinity_uri, max_size=self.pool_max_size)
|
|
inf_conn = conn_pool.get_conn()
|
|
res = inf_conn.show_current_node()
|
|
if res.error_code == ErrorCode.OK and res.server_status in ["started", "alive"]:
|
|
self.conn_pool = conn_pool
|
|
break
|
|
logging.warning(f"Infinity status: {res.server_status}. Waiting Infinity {infinity_uri} to be healthy.")
|
|
time.sleep(5)
|
|
except Exception as e:
|
|
logging.warning(f"{str(e)}. Waiting Infinity {infinity_uri} to be healthy.")
|
|
time.sleep(5)
|
|
finally:
|
|
if inf_conn is not None and conn_pool is not None:
|
|
conn_pool.release_conn(inf_conn)
|
|
if conn_pool is not None and conn_pool is not self.conn_pool:
|
|
conn_pool.destroy()
|
|
|
|
if self.conn_pool is None:
|
|
msg = f"Infinity {infinity_uri} is unhealthy in 120s."
|
|
logging.error(msg)
|
|
raise Exception(msg)
|
|
|
|
logging.info(f"Infinity {infinity_uri} is healthy. Connection pool max_size={self.pool_max_size}")
|
|
|
|
def get_conn_pool(self):
|
|
return self.conn_pool
|
|
|
|
def get_conn_uri(self):
|
|
"""
|
|
Get connection URI for PostgreSQL protocol.
|
|
"""
|
|
infinity_uri = self.INFINITY_CONFIG["uri"]
|
|
postgres_port = self.INFINITY_CONFIG["postgres_port"]
|
|
db_name = self.INFINITY_CONFIG["db_name"]
|
|
|
|
if ":" in infinity_uri:
|
|
host, _ = infinity_uri.split(":")
|
|
return f"host={host} port={postgres_port} dbname={db_name}"
|
|
return f"host=localhost port={postgres_port} dbname={db_name}"
|
|
|
|
def refresh_conn_pool(self):
|
|
try:
|
|
inf_conn = self.conn_pool.get_conn()
|
|
res = inf_conn.show_current_node()
|
|
if res.error_code == ErrorCode.OK and res.server_status in ["started", "alive"]:
|
|
return self.conn_pool
|
|
else:
|
|
raise Exception(f"{res.error_code}: {res.server_status}")
|
|
|
|
except Exception as e:
|
|
logging.error(str(e))
|
|
if hasattr(self, "conn_pool") and self.conn_pool:
|
|
self.conn_pool.destroy()
|
|
self.conn_pool = ConnectionPool(self.infinity_uri, max_size=self.pool_max_size)
|
|
return self.conn_pool
|
|
|
|
def __del__(self):
|
|
if hasattr(self, "conn_pool") and self.conn_pool:
|
|
self.conn_pool.destroy()
|
|
|
|
|
|
INFINITY_CONN = InfinityConnectionPool()
|