@@ -29,7 +29,7 @@ namespace validator {
2929
3030void ApplyBlock::abort_query (td::Status reason) {
3131 if (promise_) {
32- VLOG (VALIDATOR_WARNING) << " aborting apply block query for " << id_ << " : " << reason;
32+ VLOG (VALIDATOR_WARNING) << " aborting apply block query for " << id_. to_str () << " : " << reason;
3333 promise_.set_error (std::move (reason));
3434 }
3535 stop ();
@@ -51,7 +51,7 @@ void ApplyBlock::alarm() {
5151}
5252
5353void ApplyBlock::start_up () {
54- VLOG (VALIDATOR_DEBUG) << " running apply_block for " << id_;
54+ VLOG (VALIDATOR_DEBUG) << " running apply_block for " << id_. to_str () << " , mc_seqno= " << masterchain_block_id_. seqno () ;
5555
5656 if (id_.is_masterchain ()) {
5757 masterchain_block_id_ = id_;
@@ -71,6 +71,7 @@ void ApplyBlock::start_up() {
7171}
7272
7373void ApplyBlock::got_block_handle (BlockHandle handle) {
74+ VLOG (VALIDATOR_DEBUG) << " got_block_handle" ;
7475 handle_ = std::move (handle);
7576
7677 if (handle_->is_applied () && (!handle_->id ().is_masterchain () || handle_->processed ())) {
@@ -79,6 +80,7 @@ void ApplyBlock::got_block_handle(BlockHandle handle) {
7980 }
8081
8182 if (handle_->is_applied ()) {
83+ VLOG (VALIDATOR_DEBUG) << " already applied" ;
8284 auto P =
8385 td::PromiseCreator::lambda ([SelfId = actor_id (this ), seqno = handle_->id ().id .seqno ](td::Result<BlockIdExt> R) {
8486 R.ensure ();
@@ -94,16 +96,19 @@ void ApplyBlock::got_block_handle(BlockHandle handle) {
9496 }
9597
9698 if (handle_->id ().id .seqno == 0 ) {
99+ VLOG (VALIDATOR_DEBUG) << " seqno == 0" ;
97100 written_block_data ();
98101 return ;
99102 }
100103
101104 if (handle_->is_archived ()) {
105+ VLOG (VALIDATOR_DEBUG) << " already archived" ;
102106 finish_query ();
103107 return ;
104108 }
105109
106110 if (handle_->received ()) {
111+ VLOG (VALIDATOR_DEBUG) << " already received" ;
107112 written_block_data ();
108113 return ;
109114 }
@@ -117,6 +122,7 @@ void ApplyBlock::got_block_handle(BlockHandle handle) {
117122 }
118123 });
119124
125+ VLOG (VALIDATOR_DEBUG) << " storing block data" ;
120126 td::actor::send_closure (manager_, &ValidatorManager::set_block_data, handle_, block_, std::move (P));
121127 } else {
122128 auto P = td::PromiseCreator::lambda ([SelfId = actor_id (this ), handle = handle_](td::Result<td::Ref<BlockData>> R) {
@@ -128,13 +134,14 @@ void ApplyBlock::got_block_handle(BlockHandle handle) {
128134 }
129135 });
130136
137+ VLOG (VALIDATOR_DEBUG) << " wait for block data" ;
131138 td::actor::send_closure (manager_, &ValidatorManager::wait_block_data, handle_, apply_block_priority (), timeout_,
132139 std::move (P));
133140 }
134141}
135142
136143void ApplyBlock::written_block_data () {
137- VLOG (VALIDATOR_DEBUG) << " apply block: written block data for " << id_ ;
144+ VLOG (VALIDATOR_DEBUG) << " written_block_data " ;
138145 if (!handle_->id ().seqno ()) {
139146 CHECK (handle_->inited_split_after ());
140147 CHECK (handle_->inited_state_root_hash ());
@@ -165,24 +172,26 @@ void ApplyBlock::written_block_data() {
165172 }
166173 });
167174
175+ VLOG (VALIDATOR_DEBUG) << " wait_block_state" ;
168176 td::actor::send_closure (manager_, &ValidatorManager::wait_block_state, handle_, apply_block_priority (), timeout_,
169177 true , std::move (P));
170178 }
171179}
172180
173181void ApplyBlock::got_cur_state (td::Ref<ShardState> state) {
174- VLOG (VALIDATOR_DEBUG) << " apply block: received state for " << id_ ;
182+ VLOG (VALIDATOR_DEBUG) << " got_cur_state " ;
175183 state_ = std::move (state);
176184 CHECK (handle_->received_state ());
177185 written_state ();
178186}
179187
180188void ApplyBlock::written_state () {
189+ VLOG (VALIDATOR_DEBUG) << " written_state" ;
181190 if (handle_->is_applied () && handle_->processed ()) {
182191 finish_query ();
183192 return ;
184193 }
185- VLOG (VALIDATOR_DEBUG) << " apply block: setting next for parents of " << id_ ;
194+ VLOG (VALIDATOR_DEBUG) << " setting next for parents" ;
186195
187196 if (handle_->id ().id .seqno != 0 && !handle_->is_applied ()) {
188197 auto P = td::PromiseCreator::lambda ([SelfId = actor_id (this )](td::Result<td::Unit> R) {
@@ -208,12 +217,13 @@ void ApplyBlock::written_state() {
208217}
209218
210219void ApplyBlock::written_next () {
220+ VLOG (VALIDATOR_DEBUG) << " written_next" ;
211221 if (handle_->is_applied () && handle_->processed ()) {
212222 finish_query ();
213223 return ;
214224 }
215225
216- VLOG (VALIDATOR_DEBUG) << " apply block: applying parents of " << id_ ;
226+ VLOG (VALIDATOR_DEBUG) << " applying parents" ;
217227
218228 if (handle_->id ().id .seqno != 0 && !handle_->is_applied ()) {
219229 auto P = td::PromiseCreator::lambda ([SelfId = actor_id (this )](td::Result<td::Unit> R) {
@@ -241,7 +251,8 @@ void ApplyBlock::written_next() {
241251}
242252
243253void ApplyBlock::applied_prev () {
244- VLOG (VALIDATOR_DEBUG) << " apply block: waiting manager's confirm for " << id_;
254+ VLOG (VALIDATOR_DEBUG) << " applying parents" ;
255+ VLOG (VALIDATOR_DEBUG) << " applied_prev, waiting manager's confirm" ;
245256 if (!id_.is_masterchain ()) {
246257 handle_->set_masterchain_ref_block (masterchain_block_id_.seqno ());
247258 }
@@ -253,10 +264,11 @@ void ApplyBlock::applied_prev() {
253264 }
254265 });
255266 td::actor::send_closure (manager_, &ValidatorManager::new_block, handle_, state_, std::move (P));
267+
256268}
257269
258270void ApplyBlock::applied_set () {
259- VLOG (VALIDATOR_DEBUG) << " apply block: setting apply bit for " << id_ ;
271+ VLOG (VALIDATOR_DEBUG) << " applied_set " ;
260272 handle_->set_applied ();
261273 if (handle_->id ().seqno () > 0 ) {
262274 CHECK (handle_->handle_moved_to_archive ());
@@ -270,6 +282,7 @@ void ApplyBlock::applied_set() {
270282 td::actor::send_closure (SelfId, &ApplyBlock::finish_query);
271283 }
272284 });
285+ VLOG (VALIDATOR_DEBUG) << " flush handle" ;
273286 handle_->flush (manager_, handle_, std::move (P));
274287 } else {
275288 finish_query ();
0 commit comments