LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-08-23 17:27:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-blob-race-condition'

Browse source
This commit is contained in:
Jack Robison 2018-06-14 17:54:36 -04:00
commit 408e1bff72
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -14,7 +14,7 @@ at anytime.
### Fixed ### Fixed
* fixed token validation error when the dht node has just been started (https://github.com/lbryio/lbry/issues/1248) * fixed token validation error when the dht node has just been started (https://github.com/lbryio/lbry/issues/1248)
* * fixed a race condition when inserting a blob into the database (https://github.com/lbryio/lbry/issues/1129)
### Deprecated ### Deprecated
* *

9
lbrynet/database/storage.py
View file

@ -226,12 +226,9 @@ class SQLiteStorage(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def add_known_blob(self, blob_hash, length): def add_known_blob(self, blob_hash, length):
status = yield self.get_blob_status(blob_hash) yield self.db.runOperation(
if status is None: "insert or ignore into blob values (?, ?, ?, ?, ?, ?, ?)", (blob_hash, length, 0, 0, "pending", 0, 0)
status = "pending" )
yield self.db.runOperation("insert into blob values (?, ?, ?, ?, ?, ?, ?)",
(blob_hash, length, 0, 0, status, 0, 0))
defer.returnValue(status)
def should_announce(self, blob_hash): def should_announce(self, blob_hash):
return self.run_and_return_one_or_none( return self.run_and_return_one_or_none(