Corrected the spec test and renamed batch_size_warn_threshold to

batch_size_warn_threshold_in_kb as this follows the naming convention in the template (voxpupuli#83, voxpupuli#100).
locp · Sep 7, 2015 · 6a913a8 · 6a913a8
1 parent 511b35f
commit 6a913a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -7,7 +7,7 @@
   $authenticator                         = 'AllowAllAuthenticator',
   $authorizer                            = 'AllowAllAuthorizer',
   $auto_snapshot                         = true,
-  $batch_size_warn_threshold             = '5',
+  $batch_size_warn_threshold_in_kb       = '5',
   $cassandra_9822                        = false,
   $cassandra_yaml_tmpl                   = 'cassandra/cassandra.yaml.erb',
   $client_encryption_enabled             = false,

diff --git a/spec/classes/cassandra_spec.rb b/spec/classes/cassandra_spec.rb
@@ -281,7 +281,7 @@
     it { should contain_file('/etc/cassandra.yaml').with_content(/enabled: foo/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/keystore: foo/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/keystore_password: foo/) }
-    it { should contain_file('/etc/cassandra.yaml').with_content(/batch_size_warn_threshold_in_kb: '42'/) }
+    it { should contain_file('/etc/cassandra.yaml').with_content(/batch_size_warn_threshold_in_kb: 42/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/cluster_name: 'foo'/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/commitlog_directory: foo/) }
     it { should contain_file('/etc/cassandra.yaml').with_content(/concurrent_counter_writes: foo/) }

diff --git a/templates/cassandra.yaml.erb b/templates/cassandra.yaml.erb
@@ -547,7 +547,7 @@ column_index_size_in_kb: 64
 
 # Log WARN on any batch size exceeding this value. 5kb per batch by default.
 # Caution should be taken on increasing the size of this threshold as it can lead to node instability.
-batch_size_warn_threshold_in_kb: <%= @batch_size_warn_threshold %>
+batch_size_warn_threshold_in_kb: <%= @batch_size_warn_threshold_in_kb %>
 
 # Number of simultaneous compactions to allow, NOT including
 # validation "compactions" for anti-entropy repair.  Simultaneous