Merge branch 'master' into pr/fix

Author: shaitan

debian/changelog

@@ -1,3 +1,11 @@
+elliptics (2.27.9.11) unstable; urgency=low
+
+  * fix: initialize monitor after other server_node's inner components
+  * fix: fix deadlock if calloc returned zero
+  * fix: put transation back to timer-tree only if it exists
+
+ -- Artem Selishchev <arselishev@gmail.com>  Thu, 16 May 2019 23:34:42 +0300
+
 elliptics (2.27.9.10) unstable; urgency=low
 
   * feat: add statistics for errors per groups in dnet_recovery

library/net.c

@@ -674,22 +674,25 @@ static int dnet_process_reply(struct dnet_net_state *st, struct dnet_io_req *r)
 		t->complete(dnet_state_addr(t->st), cmd, t->priv);
 	}
 
-	dnet_trans_put(t);
 	if (!(flags & DNET_FLAGS_MORE)) {
 		memcpy(&t->cmd, cmd, sizeof(struct dnet_cmd));
 		dnet_trans_put(t);
 	} else {
 		/*
-		 * Put transaction back into the end of 'timer' tree with updated timestamp.
+		 * If transaction isn't deleted from main ('trans') tree, put it back into the end of 'timer' tree
+		 * with updated timestamp.
 		 * Transaction had been removed from timer tree in @dnet_update_trans_timestamp_network() in network
 		 * thread right after whole data was read.
 		 */
 
 		pthread_mutex_lock(&st->trans_lock);
-		dnet_trans_update_timestamp(t);
-		dnet_trans_insert_timer_nolock(st, t);
+		if (t->trans_entry.rb_parent_color) {
+			dnet_trans_update_timestamp(t);
+			dnet_trans_insert_timer_nolock(st, t);
+		}
 		pthread_mutex_unlock(&st->trans_lock);
 	}
+	dnet_trans_put(t);
 
 out:
 	return err;

library/trans.c

@@ -704,6 +704,8 @@ static int dnet_trans_convert_timed_out_to_responses(struct dnet_net_state *st,
 			                                "timed-out transaction %s in output list",
 				 dnet_dump_id(&t->cmd.id), dnet_cmd_string(t->cmd.cmd),
 				 dnet_print_trans(t));
+			dnet_logger_unset_trace_id();
+			pthread_mutex_unlock(&st->trans_lock);
 			continue;
 		}