Pass through sync_strategy

Allow to switch for Riak to use o_sync as the sync flag rather than sync

test/end_to_end/basic_SUITE.erl

@@ -24,7 +24,8 @@ all() -> [
 
 simple_put_fetch_head_delete(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}],
+    StartOpts1 = [{root_path, RootPath},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -32,7 +33,8 @@ simple_put_fetch_head_delete(_Config) ->
     testutil:check_formissingobject(Bookie1, "Bucket1", "Key2"),
     ok = leveled_bookie:book_close(Bookie1),
     StartOpts2 = [{root_path, RootPath},
-                    {max_journalsize, 3000000}],
+                    {max_journalsize, 3000000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie2} = leveled_bookie:book_start(StartOpts2),
     testutil:check_forobject(Bookie2, TestObject),
     ObjList1 = testutil:generate_objects(5000, 2),
@@ -66,7 +68,9 @@ simple_put_fetch_head_delete(_Config) ->
 
 many_put_fetch_head(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}, {max_pencillercachesize, 16000}],
+    StartOpts1 = [{root_path, RootPath},
+                    {max_pencillercachesize, 16000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -74,7 +78,8 @@ many_put_fetch_head(_Config) ->
     ok = leveled_bookie:book_close(Bookie1),
     StartOpts2 = [{root_path, RootPath},
                     {max_journalsize, 1000000000},
-                    {max_pencillercachesize, 32000}],
+                    {max_pencillercachesize, 32000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie2} = leveled_bookie:book_start(StartOpts2),
     testutil:check_forobject(Bookie2, TestObject),
     GenList = [2, 20002, 40002, 60002, 80002,
@@ -103,7 +108,8 @@ journal_compaction(_Config) ->
     RootPath = testutil:reset_filestructure(),
     StartOpts1 = [{root_path, RootPath},
                     {max_journalsize, 10000000},
-                    {max_run_length, 1}],
+                    {max_run_length, 1},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     ok = leveled_bookie:book_compactjournal(Bookie1, 30000),
     {TestObject, TestSpec} = testutil:generate_testobject(),
@@ -193,7 +199,8 @@ journal_compaction(_Config) ->
     StartOpts2 = [{root_path, RootPath},
                     {max_journalsize, 10000000},
                     {max_run_length, 1},
-                    {waste_retention_period, 1}],
+                    {waste_retention_period, 1},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie3} = leveled_bookie:book_start(StartOpts2),
     ok = leveled_bookie:book_compactjournal(Bookie3, 30000),
     testutil:wait_for_compaction(Bookie3),
@@ -208,7 +215,9 @@ journal_compaction(_Config) ->
 
 fetchput_snapshot(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}, {max_journalsize, 30000000}],
+    StartOpts1 = [{root_path, RootPath},
+                    {max_journalsize, 30000000},
+                    {sync_strategy, none}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -309,7 +318,9 @@ load_and_count(_Config) ->
     % Use artificially small files, and the load keys, counting they're all
     % present
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}, {max_journalsize, 50000000}],
+    StartOpts1 = [{root_path, RootPath},
+                    {max_journalsize, 50000000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -392,7 +403,9 @@ load_and_count(_Config) ->
 
 load_and_count_withdelete(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}, {max_journalsize, 50000000}],
+    StartOpts1 = [{root_path, RootPath},
+                    {max_journalsize, 50000000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -448,7 +461,9 @@ load_and_count_withdelete(_Config) ->
 
 space_clear_ondelete(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    StartOpts1 = [{root_path, RootPath}, {max_journalsize, 20000000}],
+    StartOpts1 = [{root_path, RootPath},
+                    {max_journalsize, 20000000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Book1} = leveled_bookie:book_start(StartOpts1),
     G2 = fun testutil:generate_compressibleobjects/2,
     testutil:load_objects(20000,

test/end_to_end/iterator_SUITE.erl

@@ -20,7 +20,8 @@ all() -> [
 small_load_with2i(_Config) ->
     RootPath = testutil:reset_filestructure(),
     StartOpts1 = [{root_path, RootPath},
-                    {max_journalsize, 5000000}],
+                    {max_journalsize, 5000000},
+                    {sync_strategy, testutil:sync_strategy()}],
                     % low journal size to make sure > 1 created
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
@@ -128,7 +129,10 @@ small_load_with2i(_Config) ->
 
 query_count(_Config) ->
     RootPath = testutil:reset_filestructure(),
-    {ok, Book1} = leveled_bookie:book_start(RootPath, 2000, 50000000),
+    {ok, Book1} = leveled_bookie:book_start(RootPath,
+                                            2000,
+                                            50000000,
+                                            testutil:sync_strategy()),
     BucketBin = list_to_binary("Bucket"),
     {TestObject, TestSpec} = testutil:generate_testobject(BucketBin,
                                                             "Key1",
@@ -177,7 +181,10 @@ query_count(_Config) ->
                                         Book1,
                                         ?KEY_ONLY),
     ok = leveled_bookie:book_close(Book1),
-    {ok, Book2} = leveled_bookie:book_start(RootPath, 1000, 50000000),
+    {ok, Book2} = leveled_bookie:book_start(RootPath,
+                                            1000,
+                                            50000000,
+                                            testutil:sync_strategy()),
     Index1Count = count_termsonindex(BucketBin,
                                         "idx1_bin",
                                         Book2,
@@ -288,7 +295,10 @@ query_count(_Config) ->
                         end,
                     R9),
     ok = leveled_bookie:book_close(Book2),
-    {ok, Book3} = leveled_bookie:book_start(RootPath, 2000, 50000000),
+    {ok, Book3} = leveled_bookie:book_start(RootPath,
+                                            2000,
+                                            50000000,
+                                            testutil:sync_strategy()),
     lists:foreach(fun({IdxF, IdxT, X}) ->
                         Q = {index_query,
                                 BucketBin,
@@ -305,7 +315,10 @@ query_count(_Config) ->
                     R9),
     ok = testutil:book_riakput(Book3, Obj9, Spc9),
     ok = leveled_bookie:book_close(Book3),
-    {ok, Book4} = leveled_bookie:book_start(RootPath, 2000, 50000000),
+    {ok, Book4} = leveled_bookie:book_start(RootPath,
+                                            2000,
+                                            50000000,
+                                            testutil:sync_strategy()),
     lists:foreach(fun({IdxF, IdxT, X}) ->
                         Q = {index_query,
                                 BucketBin,
@@ -365,7 +378,10 @@ query_count(_Config) ->
     
     ok = leveled_bookie:book_close(Book4),
     
-    {ok, Book5} = leveled_bookie:book_start(RootPath, 2000, 50000000),
+    {ok, Book5} = leveled_bookie:book_start(RootPath,
+                                            2000,
+                                            50000000,
+                                            testutil:sync_strategy()),
     {async, BLF3} = leveled_bookie:book_returnfolder(Book5, BucketListQuery),
     SW_QC = os:timestamp(),
     BucketSet3 = BLF3(),

test/end_to_end/recovery_SUITE.erl

@@ -20,10 +20,12 @@ retain_strategy(_Config) ->
     BookOpts = [{root_path, RootPath},
                     {cache_size, 1000},
                     {max_journalsize, 5000000},
+                    {sync_strategy, testutil:sync_strategy()},
                     {reload_strategy, [{?RIAK_TAG, retain}]}],
     BookOptsAlt = [{root_path, RootPath},
                     {cache_size, 1000},
                     {max_journalsize, 100000},
+                    {sync_strategy, testutil:sync_strategy()},
                     {reload_strategy, [{?RIAK_TAG, retain}]},
                     {max_run_length, 8}],
     {ok, Spcl3, LastV3} = rotating_object_check(BookOpts, "Bucket3", 800),
@@ -47,6 +49,7 @@ recovr_strategy(_Config) ->
     BookOpts = [{root_path, RootPath},
                     {cache_size, 1000},
                     {max_journalsize, 5000000},
+                    {sync_strategy, testutil:sync_strategy()},
                     {reload_strategy, [{?RIAK_TAG, recovr}]}],
     
     R6 = rotating_object_check(BookOpts, "Bucket6", 6400),
@@ -90,7 +93,8 @@ recovr_strategy(_Config) ->
 aae_bustedjournal(_Config) ->
     RootPath = testutil:reset_filestructure(),
     StartOpts = [{root_path, RootPath},
-                    {max_journalsize, 20000000}],
+                    {max_journalsize, 20000000},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),
@@ -243,7 +247,8 @@ journal_compaction_bustedjournal(_Config) ->
     RootPath = testutil:reset_filestructure(),
     StartOpts1 = [{root_path, RootPath},
                     {max_journalsize, 10000000},
-                    {max_run_length, 10}],
+                    {max_run_length, 10},
+                    {sync_strategy, testutil:sync_strategy()}],
     {ok, Bookie1} = leveled_bookie:book_start(StartOpts1),
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie1, TestObject, TestSpec),

test/end_to_end/testutil.erl

@@ -41,13 +41,26 @@
             find_journals/1,
             riak_hash/1,
             wait_for_compaction/1,
-            foldkeysfun/3]).
+            foldkeysfun/3,
+            sync_strategy/0]).
 
 -define(RETURN_TERMS, {true, undefined}).
 -define(SLOWOFFER_DELAY, 5).
 
 
 
+sync_strategy() ->
+    case erlang:system_info(otp_release) of
+        "17" ->
+            sync;
+        "18" ->
+            sync;
+        "19" ->
+            sync;
+        "16" ->
+            none
+    end.
+
 book_riakput(Pid, RiakObject, IndexSpecs) ->
     {Bucket, Key} = leveled_codec:riakto_keydetails(RiakObject),
     leveled_bookie:book_put(Pid, Bucket, Key, RiakObject, IndexSpecs, ?RIAK_TAG).
@@ -431,7 +444,8 @@ put_altered_indexed_objects(Book, Bucket, KSpecL, RemoveOld2i) ->
 rotating_object_check(RootPath, B, NumberOfObjects) ->
     BookOpts = [{root_path, RootPath},
                     {cache_size, 1000},
-                    {max_journalsize, 5000000}],
+                    {max_journalsize, 5000000},
+                    {sync_strategy, sync_strategy()}],
     {ok, Book1} = leveled_bookie:book_start(BookOpts),
     {KSpcL1, V1} = testutil:put_indexed_objects(Book1, B, NumberOfObjects),
     ok = testutil:check_indexed_objects(Book1, B, KSpcL1, V1),