mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Import wiredtiger: 150ef060dc9a3d02542eb6c4270d66d637ae02fb from branch mongodb-master 

ref: de5cdbd48e..150ef060dc
for: 7.3.0-rc0

Revert "WT-11726 Add chunk cache persistence statistics
This commit is contained in:
Luke Chen 2023-11-21 13:26:29 +11:00 committed by Evergreen Agent
parent abab38443a
commit bc6c8d074d
8 changed files with 367 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/third_party/wiredtiger/dist/stat_data.py vendored
View File

@ -411,7 +411,6 @@ conn_stats = [
##########################################
ChunkCacheStat('chunkcache_bytes_inuse', 'total bytes used by the cache'),
ChunkCacheStat('chunkcache_bytes_inuse_pinned', 'total bytes used by the cache for pinned chunks'),
ChunkCacheStat('chunkcache_bytes_read_persistent', 'total bytes read from persistent content'),
ChunkCacheStat('chunkcache_chunks_evicted', 'chunks evicted'),
ChunkCacheStat('chunkcache_chunks_inuse', 'total chunks held by the chunk cache'),
ChunkCacheStat('chunkcache_chunks_loaded_from_flushed_tables', 'number of chunks loaded from flushed tables in chunk cache'),
@ -423,10 +422,8 @@ conn_stats = [
ChunkCacheStat('chunkcache_lookups', 'lookups'),
ChunkCacheStat('chunkcache_metadata_work_units_created', 'number of metadata inserts/deletes pushed to the worker thread'),
ChunkCacheStat('chunkcache_metadata_work_units_dequeued', 'number of metadata inserts/deletes read by the worker thread'),
ChunkCacheStat('chunkcache_metadata_work_units_dropped', 'number of metadata inserts/deletes dropped by the worker thread'),
ChunkCacheStat('chunkcache_misses', 'number of misses'),
ChunkCacheStat('chunkcache_retries', 'retried accessing a chunk while I/O was in progress'),
ChunkCacheStat('chunkcache_retries_checksum_mismatch', 'retries from a chunk cache checksum mismatch'),
ChunkCacheStat('chunkcache_spans_chunks_read', 'aggregate number of spanned chunks on read'),
ChunkCacheStat('chunkcache_toomany_retries', 'timed out due to too many retries'),

2
src/third_party/wiredtiger/import.data vendored
View File

@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-master",
"commit": "de5cdbd48e4ba473e3e1988d92900adf5e95822f"
"commit": "150ef060dc9a3d02542eb6c4270d66d637ae02fb"
}

1
src/third_party/wiredtiger/src/block/block_read.c vendored
View File

@ -258,7 +258,6 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_ITEM *buf, uin
block->name, (uintmax_t)offset, size, objectid);
WT_RET(__wt_chunkcache_free_external(session, block, objectid, offset, size));
WT_RET(__wt_read(session, block->fh, offset, size, buf->mem));
WT_STAT_CONN_INCR(session, chunkcache_retries_checksum_mismatch);
}
}

4
src/third_party/wiredtiger/src/block_cache/block_chunkcache.c vendored
View File

@ -146,7 +146,7 @@ __chunkcache_drop_queued_work(WT_SESSION_IMPL *session)
--conn->chunkcache_queue_len;
WT_STAT_CONN_INCR(session, chunkcache_metadata_work_units_dropped);
/* FIXME-WT-11726 Add statistic. */
__wt_free(session, entry);
}
@ -957,7 +957,6 @@ __wt_chunkcache_free_external(
if (__hash_id_eq(&chunk->hash_id, &hash_id)) {
already_removed += chunk->chunk_size;
TAILQ_REMOVE(WT_BUCKET_CHUNKS(chunkcache, bucket_id), chunk, next_chunk);
__delete_update_stats(session, chunk);
__chunkcache_free_chunk(session, chunk);
break;
}
@ -1134,7 +1133,6 @@ __wt_chunkcache_create_from_metadata(WT_SESSION_IMPL *session, const char *name,
"new chunk instantiated from metadata during startup: %s(%u), offset=%" PRId64 ", size=%lu",
(char *)name, id, newchunk->chunk_offset, newchunk->chunk_size);
WT_STAT_CONN_INCR(session, chunkcache_created_from_metadata);
WT_STAT_CONN_INCRV(session, chunkcache_bytes_read_persistent, chunk_size);
__insert_update_stats(session, newchunk);
if (0) {

3
src/third_party/wiredtiger/src/conn/conn_chunkcache.c vendored
View File

@ -156,9 +156,10 @@ __chunkcache_metadata_pop_work(WT_SESSION_IMPL *session, WT_CHUNKCACHE_METADATA_
if ((*entryp = TAILQ_FIRST(&conn->chunkcache_metadataqh)) != NULL) {
TAILQ_REMOVE(&conn->chunkcache_metadataqh, *entryp, q);
--conn->chunkcache_queue_len;
WT_STAT_CONN_INCR(session, chunkcache_metadata_work_units_dequeued);
}
__wt_spin_unlock(session, &conn->chunkcache_metadata_lock);
WT_STAT_CONN_INCR(session, chunkcache_metadata_work_units_dequeued);
}
/*

3
src/third_party/wiredtiger/src/include/stat.h vendored
View File

@ -617,15 +617,12 @@ struct __wt_connection_stats {
int64_t chunkcache_exceeded_capacity;
int64_t chunkcache_lookups;
int64_t chunkcache_chunks_loaded_from_flushed_tables;
int64_t chunkcache_metadata_work_units_dropped;
int64_t chunkcache_metadata_work_units_created;
int64_t chunkcache_metadata_work_units_dequeued;
int64_t chunkcache_misses;
int64_t chunkcache_io_failed;
int64_t chunkcache_retries;
int64_t chunkcache_retries_checksum_mismatch;
int64_t chunkcache_toomany_retries;
int64_t chunkcache_bytes_read_persistent;
int64_t chunkcache_bytes_inuse;
int64_t chunkcache_bytes_inuse_pinned;
int64_t chunkcache_chunks_inuse;

735
src/third_party/wiredtiger/src/include/wiredtiger.in vendored
View File

File diff suppressed because it is too large Load Diff

11
src/third_party/wiredtiger/src/support/stat.c vendored
View File

@ -1576,15 +1576,12 @@ static const char *const __stats_connection_desc[] = {
"chunk-cache: could not allocate due to exceeding capacity",
"chunk-cache: lookups",
"chunk-cache: number of chunks loaded from flushed tables in chunk cache",
"chunk-cache: number of metadata inserts/deletes dropped by the worker thread",
"chunk-cache: number of metadata inserts/deletes pushed to the worker thread",
"chunk-cache: number of metadata inserts/deletes read by the worker thread",
"chunk-cache: number of misses",
"chunk-cache: number of times a read from storage failed",
"chunk-cache: retried accessing a chunk while I/O was in progress",
"chunk-cache: retries from a chunk cache checksum mismatch",
"chunk-cache: timed out due to too many retries",
"chunk-cache: total bytes read from persistent content",
"chunk-cache: total bytes used by the cache",
"chunk-cache: total bytes used by the cache for pinned chunks",
"chunk-cache: total chunks held by the chunk cache",
@ -2268,15 +2265,12 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->chunkcache_exceeded_capacity = 0;
stats->chunkcache_lookups = 0;
stats->chunkcache_chunks_loaded_from_flushed_tables = 0;
stats->chunkcache_metadata_work_units_dropped = 0;
stats->chunkcache_metadata_work_units_created = 0;
stats->chunkcache_metadata_work_units_dequeued = 0;
stats->chunkcache_misses = 0;
stats->chunkcache_io_failed = 0;
stats->chunkcache_retries = 0;
stats->chunkcache_retries_checksum_mismatch = 0;
stats->chunkcache_toomany_retries = 0;
stats->chunkcache_bytes_read_persistent = 0;
stats->chunkcache_bytes_inuse = 0;
stats->chunkcache_bytes_inuse_pinned = 0;
stats->chunkcache_chunks_inuse = 0;
@ -2973,8 +2967,6 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
to->chunkcache_lookups += WT_STAT_READ(from, chunkcache_lookups);
to->chunkcache_chunks_loaded_from_flushed_tables +=
WT_STAT_READ(from, chunkcache_chunks_loaded_from_flushed_tables);
to->chunkcache_metadata_work_units_dropped +=
WT_STAT_READ(from, chunkcache_metadata_work_units_dropped);
to->chunkcache_metadata_work_units_created +=
WT_STAT_READ(from, chunkcache_metadata_work_units_created);
to->chunkcache_metadata_work_units_dequeued +=
@ -2982,10 +2974,7 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
to->chunkcache_misses += WT_STAT_READ(from, chunkcache_misses);
to->chunkcache_io_failed += WT_STAT_READ(from, chunkcache_io_failed);
to->chunkcache_retries += WT_STAT_READ(from, chunkcache_retries);
to->chunkcache_retries_checksum_mismatch +=
WT_STAT_READ(from, chunkcache_retries_checksum_mismatch);
to->chunkcache_toomany_retries += WT_STAT_READ(from, chunkcache_toomany_retries);
to->chunkcache_bytes_read_persistent += WT_STAT_READ(from, chunkcache_bytes_read_persistent);
to->chunkcache_bytes_inuse += WT_STAT_READ(from, chunkcache_bytes_inuse);
to->chunkcache_bytes_inuse_pinned += WT_STAT_READ(from, chunkcache_bytes_inuse_pinned);
to->chunkcache_chunks_inuse += WT_STAT_READ(from, chunkcache_chunks_inuse);