mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-13 05:02:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake: hashserv: Postgres adaptations for ignoring duplicate inserts

Browse Source 
Hash Equivalence server performs unconditional insert also of duplicate
hash entries. This causes excessive error log entries in Postgres.
Rather ignore the duplicate inserts.

The alternate behavior should be isolated to the postgres
engine type.

(Bitbake rev: e8d2d178d0fe96f9d6031c97328e8be17d752716)

Signed-off-by: Tobias Hagelborn <tobiasha@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tobias Hagelborn
2024-02-18 15:59:53 -07:00
committed by Richard Purdie
parent 61e184b3ed
commit 4e673ccb00
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
bitbake/lib/hashserv/sqlalchemy.py
View File

@@ -33,6 +33,7 @@ from sqlalchemy import (
import sqlalchemy.engine
from sqlalchemy.orm import declarative_base
from sqlalchemy.exc import IntegrityError
from sqlalchemy.dialects.postgresql import insert as postgres_insert
Base = declarative_base()
@@ -283,9 +284,7 @@ class Database(object):
async def unihash_exists(self, unihash):
async with self.db.begin():
result = await self._execute(
select(UnihashesV3)
.where(UnihashesV3.unihash == unihash)
.limit(1)
select(UnihashesV3).where(UnihashesV3.unihash == unihash).limit(1)
)
return result.first() is not None
@@ -435,18 +434,30 @@ class Database(object):
return result.rowcount
async def insert_unihash(self, method, taskhash, unihash):
# Postgres specific ignore on insert duplicate
if self.engine.name == "postgresql":
statement = (
postgres_insert(UnihashesV3)
.values(
method=method,
taskhash=taskhash,
unihash=unihash,
gc_mark=self._get_config_subquery("gc-mark", ""),
)
.on_conflict_do_nothing(index_elements=("method", "taskhash"))
)
else:
statement = insert(UnihashesV3).values(
method=method,
taskhash=taskhash,
unihash=unihash,
gc_mark=self._get_config_subquery("gc-mark", ""),
)
try:
async with self.db.begin():
await self._execute(
insert(UnihashesV3).values(
method=method,
taskhash=taskhash,
unihash=unihash,
gc_mark=self._get_config_subquery("gc-mark", ""),
)
)
return True
result = await self._execute(statement)
return result.rowcount != 0
except IntegrityError:
self.logger.debug(
"%s, %s, %s already in unihash database", method, taskhash, unihash
@@ -461,10 +472,22 @@ class Database(object):
if "created" in data and not isinstance(data["created"], datetime):
data["created"] = datetime.fromisoformat(data["created"])
# Postgres specific ignore on insert duplicate
if self.engine.name == "postgresql":
statement = (
postgres_insert(OuthashesV2)
.values(**data)
.on_conflict_do_nothing(
index_elements=("method", "taskhash", "outhash")
)
)
else:
statement = insert(OuthashesV2).values(**data)
try:
async with self.db.begin():
await self._execute(insert(OuthashesV2).values(**data))
return True
result = await self._execute(statement)
return result.rowcount != 0
except IntegrityError:
self.logger.debug(
"%s, %s already in outhash database", data["method"], data["outhash"]