diff --git a/lib/coins.py b/lib/coins.py index 7ebccbb..b04bec2 100644 --- a/lib/coins.py +++ b/lib/coins.py @@ -156,9 +156,9 @@ class Bitcoin(Coin): WIF_BYTE = 0x80 GENESIS_HASH=(b'000000000019d6689c085ae165831e93' b'4ff763ae46a2a6c172b3f1b60a8ce26f') - TX_COUNT = 109611638 - TX_COUNT_HEIGHT = 398055 - TX_PER_BLOCK = 2000 + TX_COUNT = 142791895 + TX_COUNT_HEIGHT = 420976 + TX_PER_BLOCK = 1600 class BitcoinTestnet(Coin): NAME = "Bitcoin" diff --git a/server/db.py b/server/db.py index d97fcb4..99c196e 100644 --- a/server/db.py +++ b/server/db.py @@ -285,7 +285,7 @@ class DB(object): # Meta self.tx_hash_file_size = 16 * 1024 * 1024 - self.flush_MB = env.flush_MB + self.cache_MB = env.cache_MB self.next_cache_check = 0 self.last_flush = time.time() self.coin = env.coin @@ -320,7 +320,7 @@ class DB(object): self.tx_count, self.flush_count, formatted_time(self.wall_time))) self.logger.info('flushing after cache reaches {:,d} MB' - .format(self.flush_MB)) + .format(self.cache_MB)) def open_db(self, coin): db_name = '{}-{}'.format(coin.NAME, coin.NET) @@ -379,7 +379,7 @@ class DB(object): last_flush = self.last_flush tx_diff = self.tx_count - self.db_tx_count height_diff = self.height - self.db_height - self.logger.info('flushing cache: {:,d} transactions and {:,d} blocks' + self.logger.info('starting flush of {:,d} transactions, {:,d} blocks' .format(tx_diff, height_diff)) # Write out the files to the FS before flushing to the DB. If @@ -440,7 +440,7 @@ class DB(object): key = b'H' + hash168 + flush_id batch.put(key, hist.tobytes()) - self.logger.info('flushed {:,d} history entries in {:,d} addrs...' + self.logger.info('{:,d} history entries in {:,d} addrs' .format(self.history_size, len(self.history))) self.history = defaultdict(partial(array.array, 'I')) @@ -495,12 +495,16 @@ class DB(object): def cache_size(self, daemon_height): '''Returns the approximate size of the cache, in MB.''' - # Good average estimates + # Good average estimates based on traversal of subobjects and + # requesting size from Python (see deep_getsizeof). For + # whatever reason Python O/S mem usage is typically +30% or + # more, so we scale our already bloated object sizes. + one_MB = int(1048576 / 1.3) utxo_cache_size = len(self.utxo_cache.cache) * 187 db_cache_size = len(self.utxo_cache.db_cache) * 105 hist_cache_size = len(self.history) * 180 + self.history_size * 4 - utxo_MB = (db_cache_size + utxo_cache_size) // 1048576 - hist_MB = hist_cache_size // 1048576 + utxo_MB = (db_cache_size + utxo_cache_size) // one_MB + hist_MB = hist_cache_size // one_MB cache_MB = utxo_MB + hist_MB self.logger.info('cache stats at height {:,d} daemon height: {:,d}' @@ -535,7 +539,7 @@ class DB(object): now = time.time() if now > self.next_cache_check: self.next_cache_check = now + 60 - if self.cache_size(daemon_height) > self.flush_MB: + if self.cache_size(daemon_height) > self.cache_MB: self.flush_all(daemon_height) def process_tx(self, tx_hash, tx): diff --git a/server/env.py b/server/env.py index ec0e15c..5e20586 100644 --- a/server/env.py +++ b/server/env.py @@ -20,7 +20,7 @@ class Env(object): network = self.default('NETWORK', 'mainnet') self.coin = Coin.lookup_coin_class(coin_name, network) self.db_dir = self.required('DB_DIRECTORY') - self.flush_MB = self.integer('FLUSH_MB', 1000) + self.cache_MB = self.integer('CACHE_MB', 1000) self.rpc_url = self.build_rpc_url() def default(self, envvar, default):