Author: mm
Date: Sat Feb 23 08:57:47 2013
New Revision: 247174
URL: http://svnweb.freebsd.org/changeset/base/247174
Log:
Update vendor-sys/illumos/dist to illumos-gate 13958:1fd91513472c
Illumos ZFS issues:
3561 arc_meta_limit should be exposed via kstats
3116 zpool reguid may log negative guids to internal SPA history
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c Sat Feb 23 08:19:24
2013 (r247173)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/arc.c Sat Feb 23 08:57:47
2013 (r247174)
@@ -294,6 +294,9 @@ typedef struct arc_stats {
kstat_named_t arcstat_duplicate_buffers;
kstat_named_t arcstat_duplicate_buffers_size;
kstat_named_t arcstat_duplicate_reads;
+ kstat_named_t arcstat_meta_used;
+ kstat_named_t arcstat_meta_limit;
+ kstat_named_t arcstat_meta_max;
} arc_stats_t;
static arc_stats_t arc_stats = {
@@ -352,7 +355,10 @@ static arc_stats_t arc_stats = {
{ "memory_throttle_count", KSTAT_DATA_UINT64 },
{ "duplicate_buffers", KSTAT_DATA_UINT64 },
{ "duplicate_buffers_size", KSTAT_DATA_UINT64 },
- { "duplicate_reads", KSTAT_DATA_UINT64 }
+ { "duplicate_reads", KSTAT_DATA_UINT64 },
+ { "arc_meta_used", KSTAT_DATA_UINT64 },
+ { "arc_meta_limit", KSTAT_DATA_UINT64 },
+ { "arc_meta_max", KSTAT_DATA_UINT64 }
};
#define ARCSTAT(stat) (arc_stats.stat.value.ui64)
@@ -414,13 +420,13 @@ static arc_state_t *arc_l2c_only;
#define arc_c ARCSTAT(arcstat_c) /* target size of cache
*/
#define arc_c_min ARCSTAT(arcstat_c_min) /* min target cache
size */
#define arc_c_max ARCSTAT(arcstat_c_max) /* max target cache
size */
+#define arc_meta_limit ARCSTAT(arcstat_meta_limit) /* max size for
metadata */
+#define arc_meta_used ARCSTAT(arcstat_meta_used) /* size of metadata
*/
+#define arc_meta_max ARCSTAT(arcstat_meta_max) /* max size of
metadata */
static int arc_no_grow; /* Don't try to grow cache size */
static uint64_t arc_tempreserve;
static uint64_t arc_loaned_bytes;
-static uint64_t arc_meta_used;
-static uint64_t arc_meta_limit;
-static uint64_t arc_meta_max = 0;
typedef struct l2arc_buf_hdr l2arc_buf_hdr_t;
@@ -1218,7 +1224,7 @@ arc_space_consume(uint64_t space, arc_sp
break;
}
- atomic_add_64(&arc_meta_used, space);
+ ARCSTAT_INCR(arcstat_meta_used, space);
atomic_add_64(&arc_size, space);
}
@@ -1245,7 +1251,7 @@ arc_space_return(uint64_t space, arc_spa
ASSERT(arc_meta_used >= space);
if (arc_meta_max < arc_meta_used)
arc_meta_max = arc_meta_used;
- atomic_add_64(&arc_meta_used, -space);
+ ARCSTAT_INCR(arcstat_meta_used, -space);
ASSERT(arc_size >= space);
atomic_add_64(&arc_size, -space);
}
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Sat Feb 23 08:19:24
2013 (r247173)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Sat Feb 23 08:57:47
2013 (r247174)
@@ -715,7 +715,7 @@ spa_change_guid_sync(void *arg1, void *a
vdev_config_dirty(rvd);
spa_config_exit(spa, SCL_STATE, FTAG);
- spa_history_log_internal(spa, "guid change", tx, "old=%lld new=%lld",
+ spa_history_log_internal(spa, "guid change", tx, "old=%llu new=%llu",
oldguid, *newguid);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
