Minor fix in to_string, added a size parameter to the test

The SST to_string should unpack joiner IP addresses with inet_ntoa,
since the point of this string is to be human-readable for debugging.
The signature race condition doesn't seem to show up in signed_log_test,
just in CascadeChain, so maybe the problem is signed_log_test uses
updates that are so small they complete quickly.

Author: etremel

src/applications/tests/unit_tests/signed_log_test.cpp

@@ -313,30 +313,32 @@ std::unique_ptr<UnsignedObject> UnsignedObject::from_bytes(mutils::Deserializati
 }
 
 /**
- * Command-line arguments: <one_field_size> <two_field_size> <unsigned_size> <num_updates>
+ * Command-line arguments: <one_field_size> <two_field_size> <unsigned_size> <num_updates> <update_size>
  * one_field_size: Maximum size of the subgroup that replicates the one-field signed object
  * two_field_size: Maximum size of the subgroup that replicates the two-field signed object
  * mixed_field_size: Maximum size of the subgroup that replicates the mixed-signed-and-unsigned-field object
  * unsigned_size: Maximum size of the subgroup that replicates the persistent-but-not-signed object
- * num_updates: Number of randomly-generated 32-byte updates to send to each subgroup
+ * num_updates: Number of randomly-generated updates to send to each subgroup
+ * update_size: Size of the updates, in bytes
  */
 int main(int argc, char** argv) {
     pthread_setname_np(pthread_self(), "test_main");
     const std::string characters("abcdefghijklmnopqrstuvwxyz");
     std::mt19937 random_generator(getpid());
     std::uniform_int_distribution<std::size_t> char_distribution(0, characters.size() - 1);
-    const int num_args = 5;
+    const int num_args = 6;
     if(argc < (num_args + 1) || (argc > (num_args + 1) && strcmp("--", argv[argc - (num_args + 1)]) != 0)) {
         std::cout << "Invalid command line arguments." << std::endl;
-        std::cout << "Usage: " << argv[0] << " [derecho-config-options -- ] one_field_size two_field_size mixed_field_size unsigned_size num_updates" << std::endl;
+        std::cout << "Usage: " << argv[0] << " [derecho-config-options -- ] one_field_size two_field_size mixed_field_size unsigned_size num_updates update_size" << std::endl;
         return -1;
     }
 
     const unsigned int subgroup_1_size = std::stoi(argv[argc - num_args]);
     const unsigned int subgroup_2_size = std::stoi(argv[argc - num_args + 1]);
     const unsigned int subgroup_mixed_size = std::stoi(argv[argc - num_args + 2]);
     const unsigned int subgroup_unsigned_size = std::stoi(argv[argc - num_args + 3]);
-    const unsigned int num_updates = std::stoi(argv[argc - 1]);
+    const unsigned int num_updates = std::stoi(argv[argc - num_args + 4]);
+    const unsigned int update_size = std::stoi(argv[argc - 1]);
     derecho::Conf::initialize(argc, argv);
 
     derecho::SubgroupInfo subgroup_info(
@@ -401,7 +403,7 @@ int main(int argc, char** argv) {
         test_state.my_subgroup_is_unsigned = false;
         //Send random updates
         for(unsigned counter = 0; counter < num_updates; ++counter) {
-            std::string new_string('a', 32);
+            std::string new_string('a', update_size);
             std::generate(new_string.begin(), new_string.end(),
                           [&]() { return characters[char_distribution(random_generator)]; });
             object_handle.ordered_send<RPC_NAME(update_state)>(new_string);
@@ -414,8 +416,8 @@ int main(int argc, char** argv) {
         test_state.my_subgroup_is_unsigned = false;
         //Send random updates
         for(unsigned counter = 0; counter < num_updates; ++counter) {
-            std::string new_foo('a', 32);
-            std::string new_bar('a', 32);
+            std::string new_foo('a', update_size);
+            std::string new_bar('a', update_size);
             std::generate(new_foo.begin(), new_foo.end(),
                           [&]() { return characters[char_distribution(random_generator)]; });
             std::generate(new_bar.begin(), new_bar.end(),
@@ -430,7 +432,7 @@ int main(int argc, char** argv) {
         test_state.my_subgroup_is_unsigned = false;
         //Send random updates, alternating between the signed, unsigned, and nonpersistent fields
         for(unsigned counter = 0; counter < num_updates; ++counter) {
-            std::string new_string_value('a', 32);
+            std::string new_string_value('a', update_size);
             std::generate(new_string_value.begin(), new_string_value.end(),
                           [&]() { return characters[char_distribution(random_generator)]; });
             if(counter % 3 == 0) {
@@ -449,7 +451,7 @@ int main(int argc, char** argv) {
         test_state.my_subgroup_is_unsigned = true;
         //Send random updates
         for(unsigned counter = 0; counter < num_updates; ++counter) {
-            std::string new_string('a', 32);
+            std::string new_string('a', update_size);
             std::generate(new_string.begin(), new_string.end(),
                           [&]() { return characters[char_distribution(random_generator)]; });
             object_handle.ordered_send<RPC_NAME(update_state)>(new_string);

src/core/derecho_sst.cpp

@@ -1,5 +1,6 @@
 #include <derecho/core/detail/derecho_sst.hpp>
 
+#include <arpa/inet.h>
 #include <atomic>
 #include <cstring>
 
@@ -129,7 +130,7 @@ std::string DerechoSST::to_string() const {
         }
         s << "}, joiner_ips={ ";
         for(int n = 0; n < (num_changes[row] - num_installed[row]); ++n) {
-            s << joiner_ips[row][n] << " ";
+            s << inet_ntoa(in_addr{joiner_ips[row][n]}) << " ";
         }
         s << "}, joiner_gms_ports={ ";
         for(int n = 0; n < (num_changes[row] - num_installed[row]); ++n) {
@@ -170,7 +171,7 @@ std::string DerechoSST::to_string() const {
             s << (global_min_ready[row] ? "T" : "F") << " ";
         }
         s << "}"
-          << "local_stability_frontier={";
+          << ", local_stability_frontier={";
         for(unsigned int n = 0; n < local_stability_frontier.size(); n++) {
             s << local_stability_frontier[row][n] << " ";
         }

src/core/git_version.cpp

@@ -13,8 +13,8 @@ namespace derecho {
 const int MAJOR_VERSION = 2;
 const int MINOR_VERSION = 4;
 const int PATCH_VERSION = 1;
-const int COMMITS_AHEAD_OF_VERSION = 6;
+const int COMMITS_AHEAD_OF_VERSION = 7;
 const char* VERSION_STRING = "2.4.1";
-const char* VERSION_STRING_PLUS_COMMITS = "2.4.1+6";
+const char* VERSION_STRING_PLUS_COMMITS = "2.4.1+7";
 
 }