remove debug panics · microcosm.blue/microcosm-rs@3be0b3b

+29 -91

1 changed file

expand all

link_aggregator

src

storage

rocks_store.rs

+29 -91

link_aggregator/src/storage/rocks_store.rs

··· 105 105 k 106 106 } 107 107 } 108 - impl<O, I: IdTableValue> Drop for IdTableBase<O, I> 109 - where 110 - O: KeyFromRocks, 111 - for<'a> &'a O: AsRocksKey, 112 - { 113 - fn drop(&mut self) { 114 - if !std::thread::panicking() && !self.did_init { 115 - panic!( 116 - "the id table '{}' was dropped without being initialized: call .init() on it.", 117 - self.name 118 - ); 119 - } 120 - } 121 - } 122 108 #[derive(Debug, Clone)] 123 109 struct IdTable<Orig, IdVal: IdTableValue, const WITH_REVERSE: bool> 124 110 where ··· 265 251 target_id_table.cf_descriptor(), 266 252 // the reverse links: 267 253 ColumnFamilyDescriptor::new(TARGET_LINKERS_CF, { 268 - let did_id_seq = did_id_table.id_seq.clone(); 269 254 let mut opts = rocks_opts_base(); 270 255 opts.set_merge_operator_associative( 271 256 "merge_op_extend_did_ids", 272 - move |k, ex, ops| Self::merge_op_extend_did_ids(k, ex, ops, &did_id_seq), 257 + Self::merge_op_extend_did_ids, 273 258 ); 274 259 opts 275 260 }), ··· 292 277 _new_key: &[u8], 293 278 existing: Option<&[u8]>, 294 279 operands: &MergeOperands, 295 - current_did_id_seq: &AtomicU64, 296 280 ) -> Option<Vec<u8>> { 297 - let mut tls: TargetLinkers = existing 298 - .map(|existing_bytes| _vr(existing_bytes).unwrap()) 299 - .unwrap_or_default(); 300 - 301 - let current_seq = current_did_id_seq.load(Ordering::SeqCst); 302 - 303 - for did_id_rkey in &tls.0 { 304 - let DidId(ref n) = did_id_rkey.0; 305 - if current_seq > 0 && *n > current_seq { 306 - eprintln!("problem with merge_op_extend_did_ids. existing: {tls:?}"); 307 - eprintln!( 308 - "an entry has did_id={n}, which is higher than the current sequence: {current_seq}" 309 - ); 310 - panic!("got a did to merge with higher-than-current did_id sequence"); 281 + let mut linkers: Vec<_> = if let Some(existing_bytes) = existing { 282 + match _vr(existing_bytes) { 283 + Ok(TargetLinkers(mut existing_linkers)) => { 284 + existing_linkers.reserve(operands.len()); 285 + existing_linkers 286 + } 287 + Err(e) => { 288 + eprintln!("bug? could not deserialize existing target linkers: {e:?}"); 289 + return None; 290 + } 311 291 } 312 - } 313 - 314 - for op in operands { 315 - let new_linkers: TargetLinkers = _vr(op).unwrap(); 316 - for (DidId(ref n), _) in &new_linkers.0 { 317 - if current_seq > 0 && *n > current_seq { 318 - let orig: Option<TargetLinkers> = 319 - existing.map(|existing_bytes| _vr(existing_bytes).unwrap()); 320 - eprintln!( 321 - "problem with merge_op_extend_did_ids. existing: {orig:?}\nnew linkers: {new_linkers:?}" 322 - ); 323 - eprintln!("the current sequence is {current_seq}"); 324 - panic!("did_id a did to a number higher than the current sequence"); 292 + } else { 293 + Vec::with_capacity(operands.len()) 294 + }; 295 + for new_linkers in operands { 296 + match _vr(new_linkers) { 297 + Ok(TargetLinkers(new_linkers)) => linkers.extend(new_linkers), 298 + Err(e) => { 299 + eprintln!("bug? could not deserialize new target linkrers: {e:?}"); 300 + return None; 325 301 } 326 302 } 327 - tls.0.extend(new_linkers.0); 328 303 } 329 - Some(_rv(&tls)) 304 + Some(_rv(&TargetLinkers(linkers))) 330 305 } 331 306 332 307 fn prefix_iter_cf<K, V, CF, P>( ··· 515 490 516 491 // we do read -> modify -> write here: could merge-op in the deletes instead? 517 492 // otherwise it's another single-thread-constraining thing. 518 - for (i, RecordLinkTarget(rpath, target_id)) in record_link_targets.0.iter().enumerate() { 519 - self.update_target_linkers(batch, target_id, |mut linkers| { 493 + for RecordLinkTarget(_, target_id) in record_link_targets.0 { 494 + self.update_target_linkers(batch, &target_id, |mut linkers| { 520 495 if linkers.0.is_empty() { 521 - eprintln!("about to blow up because a linked target is apparently missing."); 522 - eprintln!("removing links for: {record_id:?}"); 523 - eprintln!("found links: {record_link_targets:?}"); 524 - eprintln!("working on #{i}: {rpath:?} / {target_id:?}"); 525 - panic!("it was empty"); 496 + eprintln!("bug? linked target was missing when removing links"); 526 497 } 527 498 if !linkers.remove_linker(&linking_did_id, &RKey(record_id.rkey.clone())) { 528 - eprintln!("about to blow up because a linked target apparently does not have us in its dids."); 529 - eprintln!("removing links for: {record_id:?}"); 530 - eprintln!("found links: {record_link_targets:?}"); 531 - eprintln!("working on #{i}: {rpath:?} / {target_id:?}"); 532 - eprintln!("trying to find us ({linking_did_id:?}) in {linkers:?}"); 533 - panic!("reverse index didn't have us"); 499 + eprintln!("bug? linked target was missing a link when removing links"); 534 500 } 535 501 Some(linkers) 536 502 })?; ··· 563 529 } 564 530 565 531 fn delete_account(&mut self, did: &Did, batch: &mut WriteBatch) -> Result<()> { 566 - let Some(DidIdValue(did_id, active)) = self.did_id_table.get_id_val(&self.db, did)? else { 532 + let Some(DidIdValue(did_id, _)) = self.did_id_table.get_id_val(&self.db, did)? else { 567 533 return Ok(()); // ignore updates for dids we don't know about 568 534 }; 569 535 self.delete_did_id_value(batch, did); ··· 578 544 for chunk in stuff.chunks(1024) { 579 545 let mut mini_batch = WriteBatch::default(); 580 546 581 - for (i, (record_link_key, links)) in chunk.iter().enumerate() { 547 + for (record_link_key, links) in chunk { 582 548 self.delete_record_link(&mut mini_batch, record_link_key); // _could_ use delete range here instead of individual deletes, but since we have to scan anyway it's not obvious if it's better 583 549 584 - for (j, RecordLinkTarget(path, target_link_id)) in links.0.iter().enumerate() { 550 + for RecordLinkTarget(_, target_link_id) in links.0.iter() { 585 551 self.update_target_linkers(&mut mini_batch, target_link_id, |mut linkers| { 586 552 if !linkers.remove_linker(&did_id, &record_link_key.2) { 587 - eprintln!( 588 - "DELETING ACCOUNT: blowing up: missing linker entry in linked target." 589 - ); 590 - eprintln!("account: {did:?}"); 591 - eprintln!("did_id: {did_id:?}, was active? {active:?}"); 592 - eprintln!("with links: {links:?}"); 593 - eprintln!("and linkers: {linkers:?}"); 594 - eprintln!( 595 - "working on #{i}.#{j}: {:?} / {path:?} / {target_link_id:?}", 596 - record_link_key.collection() 597 - ); 598 - eprintln!("from record link key {record_link_key:?}"); 599 - eprintln!("but could not find this link :/"); 600 - eprintln!("checking for did_id dups..."); 601 - eprintln!("ok so what the heck. did_id again, for did {did:?}:"); 602 - let did_id_again = self 603 - .did_id_table 604 - .get_id_val(&self.db, did) 605 - .unwrap() 606 - .unwrap(); // TODO 607 - eprintln!("did_id_value (again): {did_id_again:?}"); 608 - panic!("ohnoooo"); 553 + eprintln!("bug? could not find linker when removing links while deleting an account"); 609 554 } 610 555 Some(linkers) 611 556 })?; ··· 909 854 // forward links to targets so we can delete links 910 855 #[derive(Debug, Serialize, Deserialize)] 911 856 struct RecordLinkKey(DidId, Collection, RKey); 912 - 913 - impl RecordLinkKey { 914 - fn collection(&self) -> Collection { 915 - let Self(_, collection, _) = self; 916 - collection.clone() 917 - } 918 - } 919 857 920 858 // does this even work???? 921 859 #[derive(Debug, Serialize, Deserialize)]

Configure Feed

Configure Feed