log more during consensus voting process

Give more visibility to directory authority operators during the consensus
voting process.

Closes ticket 40245.

diff --git a/changes/ticket40245 b/changes/ticket40245
new file mode 100644 (file)
index 0000000..6413723
--- /dev/null
+++ b/changes/ticket40245
@@ -0,0 +1,4 @@
+  o Minor features (logging):
+    - Give more visibility to directory authority operators during the
+      consensus voting process and while processing relay descriptors.
+      Closes ticket 40245.

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index cf1135ba37e91fdd3a792bdb681b9259f7b5f7f5..fa4d919aa9a743ec10a4284a9c080ca823754fe7 100644 (file)
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -2975,7 +2975,7 @@ dirvote_perform_vote(void)
   if (!contents)
     return -1;
 
-  pending_vote = dirvote_add_vote(contents, 0, &msg, &status);
+  pending_vote = dirvote_add_vote(contents, 0, "self", &msg, &status);
   tor_free(contents);
   if (!pending_vote) {
     log_warn(LD_DIR, "Couldn't store my own vote! (I told myself, '%s'.)",
@@ -3169,6 +3169,7 @@ add_new_cert_if_needed(const struct authority_cert_t *cert)
  * only) */
 pending_vote_t *
 dirvote_add_vote(const char *vote_body, time_t time_posted,
+                 const char *where_from,
                  const char **msg_out, int *status_out)
 {
   networkstatus_t *vote;
@@ -3226,6 +3227,14 @@ dirvote_add_vote(const char *vote_body, time_t time_posted,
     goto err;
   }
 
+  if (time_posted) { /* they sent it to me via a POST */
+    log_notice(LD_DIR, "%s posted a vote to me from %s.",
+               vi->nickname, where_from);
+  } else { /* I imported this one myself */
+    log_notice(LD_DIR, "Retrieved %s's vote from %s.",
+               vi->nickname, where_from);
+  }
+
   /* Check if we received it, as a post, after the cutoff when we
    * start asking other dir auths for it. If we do, the best plan
    * is to discard it, because using it greatly increases the chances
@@ -3235,10 +3244,10 @@ dirvote_add_vote(const char *vote_body, time_t time_posted,
     char tbuf1[ISO_TIME_LEN+1], tbuf2[ISO_TIME_LEN+1];
     format_iso_time(tbuf1, time_posted);
     format_iso_time(tbuf2, voting_schedule.fetch_missing_votes);
-    log_warn(LD_DIR, "Rejecting posted vote from %s received at %s; "
+    log_warn(LD_DIR, "Rejecting %s's posted vote from %s received at %s; "
              "our cutoff for received votes is %s. Check your clock, "
              "CPU load, and network load. Also check the authority that "
-             "posted the vote.", vi->address, tbuf1, tbuf2);
+             "posted the vote.", vi->nickname, vi->address, tbuf1, tbuf2);
     *msg_out = "Posted vote received too late, would be dangerous to count it";
     goto err;
   }
@@ -3254,8 +3263,8 @@ dirvote_add_vote(const char *vote_body, time_t time_posted,
         networkstatus_voter_info_t *vi_old = get_voter(v->vote);
         if (fast_memeq(vi_old->vote_digest, vi->vote_digest, DIGEST_LEN)) {
           /* Ah, it's the same vote. Not a problem. */
-          log_info(LD_DIR, "Discarding a vote we already have (from %s).",
-                   vi->address);
+          log_notice(LD_DIR, "Discarding a vote we already have (from %s).",
+                     vi->address);
           if (*status_out < 200)
             *status_out = 200;
           goto discard;
@@ -3278,6 +3287,8 @@ dirvote_add_vote(const char *vote_body, time_t time_posted,
             *msg_out = "OK";
           return v;
         } else {
+          log_notice(LD_DIR, "Discarding vote from %s because we have "
+                     "a newer one already.", vi->address);
           *msg_out = "Already have a newer pending vote";
           goto err;
         }

diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index 4f48e45dc340a91e04edb60b90dfbf8fc6d1e872..f9441773a7448d28cbeea8d3286ed60dc88dd6a6 100644 (file)
--- a/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@ -99,6 +99,7 @@ void dirvote_dirreq_get_status_vote(const char *url, smartlist_t *items,
 /* Storing signatures and votes functions */
 struct pending_vote_t * dirvote_add_vote(const char *vote_body,
                                          time_t time_posted,
+                                         const char *where_from,
                                          const char **msg_out,
                                          int *status_out);
 int dirvote_add_signatures(const char *detached_signatures_body,
@@ -149,11 +150,13 @@ dirvote_dirreq_get_status_vote(const char *url, smartlist_t *items,
 static inline struct pending_vote_t *
 dirvote_add_vote(const char *vote_body,
                  time_t time_posted,
+                 const char *where_from,
                  const char **msg_out,
                  int *status_out)
 {
   (void) vote_body;
   (void) time_posted;
+  (void) where_from;
   /* If the dirauth module is disabled, this should NEVER be called else we
    * failed to safeguard the dirauth module. */
   tor_assert_nonfatal_unreached();

diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c
index 7f6452afbb0600ab412e24e78f7aea81230b3f18..00bb0abf239e92a0a6a2d41c14fad94333702f26 100644 (file)
--- a/src/feature/dircache/dircache.c
+++ b/src/feature/dircache/dircache.c
@@ -1708,7 +1708,8 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers,
       !strcmp(url,"/tor/post/vote")) { /* v3 networkstatus vote */
     const char *msg = "OK";
     int status;
-    if (dirvote_add_vote(body, approx_time(), &msg, &status)) {
+    if (dirvote_add_vote(body, approx_time(), TO_CONN(conn)->address,
+                         &msg, &status)) {
       write_short_http_response(conn, status, "Vote stored");
     } else {
       tor_assert(msg);

diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index 74e68ac6be323dd92cee89645bc5e8fc37afdf70..a5dd856729bcccbd4ace83d0a9a718368caa953b 100644 (file)
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -2419,8 +2419,8 @@ handle_response_fetch_status_vote(dir_connection_t *conn,
 
   const char *msg;
   int st;
-  log_info(LD_DIR,"Got votes (body size %d) from server %s",
-           (int)body_len, connection_describe_peer(TO_CONN(conn)));
+  log_notice(LD_DIR,"Got votes (body size %d) from server %s",
+             (int)body_len, connection_describe_peer(TO_CONN(conn)));
   if (status_code != 200) {
     log_warn(LD_DIR,
              "Received http status code %d (%s) from server "
@@ -2430,7 +2430,7 @@ handle_response_fetch_status_vote(dir_connection_t *conn,
              conn->requested_resource);
     return -1;
   }
-  dirvote_add_vote(body, 0, &msg, &st);
+  dirvote_add_vote(body, 0, TO_CONN(conn)->address, &msg, &st);
   if (st > 299) {
     log_warn(LD_DIR, "Error adding retrieved vote: %s", msg);
   } else {
@@ -2720,7 +2720,7 @@ handle_response_upload_vote(dir_connection_t *conn,
 
   switch (status_code) {
   case 200: {
-    log_notice(LD_DIR,"Uploaded a vote to dirserver %s",
+    log_notice(LD_DIR,"Uploaded my vote to dirserver %s",
                connection_describe_peer(TO_CONN(conn)));
   }
     break;

diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index f717f839326b5c7c0eaa23843b0946ccf8b9cbed..28f07efbe8bc7e1856d8ee68eaef40178a042d83 100644 (file)
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -2105,7 +2105,7 @@ test_dir_handle_get_status_vote_d(void* data)
 
   const char *msg_out = NULL;
   int status_out = 0;
-  struct pending_vote_t *pv = dirvote_add_vote(VOTE_BODY_V3, 0,
+  struct pending_vote_t *pv = dirvote_add_vote(VOTE_BODY_V3, 0, "foo",
                                                &msg_out, &status_out);
   tt_assert(pv);
 
@@ -2487,7 +2487,7 @@ test_dir_handle_get_status_vote_next_authority(void* data)
   time_t now = 1441223455 -1;
   dirauth_sched_recalculate_timing(mock_options, now);
 
-  struct pending_vote_t *vote = dirvote_add_vote(VOTE_BODY_V3, 0,
+  struct pending_vote_t *vote = dirvote_add_vote(VOTE_BODY_V3, 0, "foo",
                                                  &msg_out, &status_out);
   tt_assert(vote);
 
@@ -2649,7 +2649,7 @@ test_dir_handle_get_status_vote_current_authority(void* data)
   time_t now = 1441223455;
   dirauth_sched_recalculate_timing(mock_options, now-1);
 
-  struct pending_vote_t *vote = dirvote_add_vote(VOTE_BODY_V3, 0,
+  struct pending_vote_t *vote = dirvote_add_vote(VOTE_BODY_V3, 0, "foo",
                                                  &msg_out, &status_out);
   tt_assert(vote);
 
@@ -2777,7 +2777,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* Next voting interval */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          fetch_missing + vote_interval,
+                          fetch_missing + vote_interval, "foo",
                           &msg_out, &status_out);
   tt_assert(!vote);
   tt_int_op(status_out, OP_EQ, 400);
@@ -2786,7 +2786,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* Just after fetch missing */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          fetch_missing + 1,
+                          fetch_missing + 1, "foo",
                           &msg_out, &status_out);
   tt_assert(!vote);
   tt_int_op(status_out, OP_EQ, 400);
@@ -2795,7 +2795,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* On fetch missing */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          fetch_missing,
+                          fetch_missing, "foo",
                           &msg_out, &status_out);
   tt_assert(vote);
 
@@ -2806,7 +2806,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* Between voting starts and fetch missing */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          voting_starts + 1,
+                          voting_starts + 1, "foo",
                           &msg_out, &status_out);
   tt_assert(vote);
 
@@ -2817,7 +2817,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* On voting starts */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          voting_starts,
+                          voting_starts, "foo",
                           &msg_out, &status_out);
   tt_assert(vote);
 
@@ -2828,7 +2828,7 @@ test_dir_handle_get_status_vote_too_late(void* data)
 
   /* Just before voting starts */
   vote = dirvote_add_vote(VOTE_BODY_V3,
-                          voting_starts - 1,
+                          voting_starts - 1, "foo",
                           &msg_out, &status_out);
   tt_assert(vote);