[svn-r19096] Description:

	Bring "round robin" metadata write strategy code from 'round_robin'
branch to the trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 182 insertions, 53 deletions

diff --git a/test/cache_api.c b/test/cache_api.c
index 8fd2912..c6e27c6 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -65,11 +65,8 @@ static void check_file_mdc_api_errs(void);
  * Programmer:	John Mainzer
  *              4/12/04
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 static void
 check_fapl_mdc_api_calls(void)
 {
@@ -113,7 +110,9 @@ check_fapl_mdc_api_calls(void)
       /* int         epochs_before_eviction = */ 4,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t scratch;
     H5C_auto_size_ctl_t default_auto_size_ctl;
@@ -560,7 +559,9 @@ check_file_mdc_api_calls(void)
       /* int         epochs_before_eviction = */ 4,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_2 =
     {
@@ -593,7 +594,9 @@ check_file_mdc_api_calls(void)
       /* int         epochs_before_eviction = */ 4,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_3 =
     {
@@ -626,7 +629,9 @@ check_file_mdc_api_calls(void)
       /* int         epochs_before_eviction = */ 3,
       /* hbool_t     apply_empty_reserve    = */ FALSE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_4 =
     {
@@ -660,7 +665,9 @@ check_file_mdc_api_calls(void)
       /* int         epochs_before_eviction = */ 3,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.1,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
 
     TESTING("MDC/FILE related API calls");
@@ -915,7 +922,9 @@ mdc_api_call_smoke_check(int express_test)
       /* int         epochs_before_eviction = */ 2,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_2 =
     {
@@ -948,7 +957,9 @@ mdc_api_call_smoke_check(int express_test)
       /* int         epochs_before_eviction = */ 2,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
     H5AC_cache_config_t mod_config_3 =
     {
@@ -981,7 +992,9 @@ mdc_api_call_smoke_check(int express_test)
       /* int         epochs_before_eviction = */ 2,
       /* hbool_t     apply_empty_reserve    = */ TRUE,
       /* double      empty_reserve          = */ 0.05,
-      /* int         dirty_bytes_threshold  = */ (256 * 1024)
+      /* int         dirty_bytes_threshold  = */ (256 * 1024),
+      /* int	    metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
     };
 
     TESTING("MDC API smoke check");
@@ -1514,7 +1527,7 @@ mdc_api_call_smoke_check(int express_test)
  * used to test error rejection in the MDC related API calls.
  */
 
-#define NUM_INVALID_CONFIGS	41
+#define NUM_INVALID_CONFIGS	42
 
 H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
 {
@@ -1549,7 +1562,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 1 -- bad rpt_fcn_enabled */
@@ -1582,7 +1597,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 2 -- bad open_trace_file */
@@ -1615,7 +1632,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 3 -- bad close_trace_file */
@@ -1648,7 +1667,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 4 -- open_trace_file == TRUE and empty trace_file_name */
@@ -1681,7 +1702,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 5 -- bad set_initial_size */
@@ -1714,7 +1737,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 6 -- max_size too big */
@@ -1747,7 +1772,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 7 -- min_size too small */
@@ -1780,7 +1807,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 8 -- min_size > max_size */
@@ -1813,7 +1842,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 9 -- initial size out of range (too big) */
@@ -1846,7 +1877,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 10 -- initial_size out of range (too small) */
@@ -1879,7 +1912,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 11 -- min_clean_fraction too big */
@@ -1912,7 +1947,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 12 -- min_clean_fraction too small */
@@ -1945,7 +1982,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 13 -- epoch_length too small */
@@ -1978,7 +2017,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 14 -- epoch_length too big */
@@ -2011,7 +2052,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 15 -- invalid incr_mode */
@@ -2044,7 +2087,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 16 -- lower_hr_threshold too small */
@@ -2077,7 +2122,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 17 -- lower_hr_threshold too big */
@@ -2110,7 +2157,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 18 -- increment too small */
@@ -2143,7 +2192,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 19 -- bad apply_max_increment */
@@ -2176,7 +2227,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 20 -- invalid flash_incr_mode */
@@ -2209,7 +2262,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 21 -- flash_multiple too small */
@@ -2242,7 +2297,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 22 -- flash_multiple too big */
@@ -2275,7 +2332,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 23 -- flash_threshold too small */
@@ -2308,7 +2367,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 24 -- flash_threshold too big */
@@ -2341,7 +2402,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 25 -- bad decr_mode */
@@ -2374,7 +2437,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 26 -- upper_hr_threshold too big */
@@ -2407,7 +2472,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 27 -- decrement too small */
@@ -2440,7 +2507,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 28 -- decrement too big */
@@ -2473,7 +2542,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 29 -- epochs_before_eviction too small */
@@ -2506,7 +2577,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 0,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 30 -- epochs_before_eviction too big */
@@ -2539,7 +2612,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ H5C__MAX_EPOCH_MARKERS + 1,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 31 -- invalid apply_empty_reserve */
@@ -2572,7 +2647,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ 2,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 32 -- empty_reserve too small */
@@ -2605,7 +2682,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ -0.0000000001,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 33 -- empty_reserve too big */
@@ -2638,7 +2717,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 1.00000000001,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 34 -- upper_hr_threshold too small */
@@ -2671,7 +2752,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 35 -- upper_hr_threshold too big */
@@ -2704,7 +2787,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 36 -- upper_hr_threshold <= lower_hr_threshold */
@@ -2737,7 +2822,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 37 -- dirty_bytes_threshold too small */
@@ -2770,7 +2857,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (H5C__MIN_MAX_CACHE_SIZE / 2) - 1
+    /* int         dirty_bytes_threshold  = */ (H5C__MIN_MAX_CACHE_SIZE / 2) - 1,
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 38 -- dirty_bytes_threshold too big */
@@ -2803,7 +2892,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (H5C__MAX_MAX_CACHE_SIZE / 4) + 1
+    /* int         dirty_bytes_threshold  = */ (H5C__MAX_MAX_CACHE_SIZE / 4) + 1,
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 39 -- attempt to disable evictions when auto incr enabled */
@@ -2836,7 +2927,9 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
   },
   {
     /* 40 -- attempt to disable evictions when auto decr enabled */
@@ -2869,7 +2962,43 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
     /* double      empty_reserve          = */ 0.1,
-    /* int         dirty_bytes_threshold  = */ (256 * 1024)
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */
+				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
+  },
+  {
+    /* 41 -- unknown metadata write strategy */
+    /* int         version                = */ H5C__CURR_AUTO_SIZE_CTL_VER,
+    /* hbool_t     rpt_fcn_enabled        = */ FALSE,
+    /* hbool_t     open_trace_file        = */ FALSE,
+    /* hbool_t     close_trace_file       = */ FALSE,
+    /* char        trace_file_name[]      = */ "",
+    /* hbool_t     evictions_enabled      = */ TRUE,
+    /* hbool_t     set_initial_size       = */ TRUE,
+    /* size_t      initial_size           = */ (1 * 1024 * 1024),
+    /* double      min_clean_fraction     = */ 0.25,
+    /* size_t      max_size               = */ (16 * 1024 * 1024),
+    /* size_t      min_size               = */ ( 1 * 1024 * 1024),
+    /* long int    epoch_length           = */ 50000,
+    /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
+    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      increment              = */ 2.0,
+    /* hbool_t     apply_max_increment    = */ TRUE,
+    /* size_t      max_increment          = */ (4 * 1024 * 1024),
+    /* enum H5C_cache_flash_incr_mode       */
+    /*                    flash_incr_mode = */ H5C_flash_incr__off,
+    /* double      flash_multiple         = */ 2.0,
+    /* double      flash_threshold        = */ 0.5,
+    /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
+    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      decrement              = */ 0.9,
+    /* hbool_t     apply_max_decrement    = */ TRUE,
+    /* size_t      max_decrement          = */ (1 * 1024 * 1024),
+    /* int         epochs_before_eviction = */ 3,
+    /* hbool_t     apply_empty_reserve    = */ TRUE,
+    /* double      empty_reserve          = */ 0.1,
+    /* int         dirty_bytes_threshold  = */ (256 * 1024),
+    /* int	  metadata_write_strategy = */ -1
   }
 };