Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove panic and fix monitoring processor #254

Merged
merged 2 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions rust/processor/src/models/user_transactions_models/signatures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,15 @@ impl Signature {
Ok(AnySignatureTypeEnumPb::Secp256k1Ecdsa) => {
String::from("multi_key_secp256k1_ecdsa_signature")
},
_ => {
panic!("Unspecified signature type or un-recognized type is not supported")
wildcard => {
tracing::warn!(
"Unspecified signature type or un-recognized type is not supported: {:?}",
wildcard
);
PROCESSOR_DATA_GAP_COUNT
.with_label_values(&["unspecified_signature_type"])
.inc();
"".to_string()
},
};
signatures.push(Self {
Expand Down
4 changes: 4 additions & 0 deletions rust/processor/src/processors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub mod coin_processor;
pub mod default_processor;
pub mod events_processor;
pub mod fungible_asset_processor;
pub mod monitoring_processor;
pub mod nft_metadata_processor;
pub mod objects_processor;
pub mod stake_processor;
Expand All @@ -27,6 +28,7 @@ use self::{
default_processor::DefaultProcessor,
events_processor::EventsProcessor,
fungible_asset_processor::FungibleAssetProcessor,
monitoring_processor::MonitoringProcessor,
nft_metadata_processor::{NftMetadataProcessor, NftMetadataProcessorConfig},
objects_processor::ObjectsProcessor,
stake_processor::StakeProcessor,
Expand Down Expand Up @@ -177,6 +179,7 @@ pub enum ProcessorConfig {
DefaultProcessor,
EventsProcessor,
FungibleAssetProcessor,
MonitoringProcessor,
NftMetadataProcessor(NftMetadataProcessorConfig),
ObjectsProcessor,
StakeProcessor,
Expand Down Expand Up @@ -217,6 +220,7 @@ pub enum Processor {
DefaultProcessor,
EventsProcessor,
FungibleAssetProcessor,
MonitoringProcessor,
NftMetadataProcessor,
ObjectsProcessor,
StakeProcessor,
Expand Down
36 changes: 11 additions & 25 deletions rust/processor/src/processors/monitoring_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,10 @@
// SPDX-License-Identifier: Apache-2.0

use super::{ProcessingResult, ProcessorName, ProcessorTrait};
use crate::{
models::default_models::{
block_metadata_transactions::BlockMetadataTransactionModel,
move_modules::MoveModule,
move_resources::MoveResource,
move_tables::{CurrentTableItem, TableItem, TableMetadata},
transactions::TransactionModel,
v2_objects::{CurrentObject, Object},
write_set_changes::{WriteSetChangeDetail, WriteSetChangeModel},
},
schema,
utils::database::{
clean_data_for_db, execute_with_better_error, get_chunks, MyDbConnection, PgDbPool,
PgPoolConnection,
},
};
use anyhow::bail;
use aptos_protos::transaction::v1::{write_set_change::Change, Transaction};
use crate::utils::database::PgDbPool;
use aptos_protos::transaction::v1::Transaction;
use async_trait::async_trait;
use diesel::{pg::upsert::excluded, result::Error, ExpressionMethods};
use field_count::FieldCount;
use std::{collections::HashMap, fmt::Debug};
use tracing::error;
use std::fmt::Debug;

pub struct MonitoringProcessor {
connection_pool: PgDbPool,
Expand All @@ -41,7 +22,7 @@ impl Debug for MonitoringProcessor {
let state = &self.connection_pool.state();
write!(
f,
"DefaultTransactionProcessor {{ connections: {:?} idle_connections: {:?} }}",
"MonitoringProcessor {{ connections: {:?} idle_connections: {:?} }}",
state.connections, state.idle_connections
)
}
Expand All @@ -55,12 +36,17 @@ impl ProcessorTrait for MonitoringProcessor {

async fn process_transactions(
&self,
transactions: Vec<Transaction>,
_transactions: Vec<Transaction>,
start_version: u64,
end_version: u64,
_: Option<u64>,
) -> anyhow::Result<ProcessingResult> {
Ok((end_version, transactions.len() as u64))
Ok(ProcessingResult {
start_version,
end_version,
processing_duration_in_secs: 0.0,
db_insertion_duration_in_secs: 0.0,
})
}

fn connection_pool(&self) -> &PgDbPool {
Expand Down
10 changes: 6 additions & 4 deletions rust/processor/src/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ use crate::{
account_transactions_processor::AccountTransactionsProcessor, ans_processor::AnsProcessor,
coin_processor::CoinProcessor, default_processor::DefaultProcessor,
events_processor::EventsProcessor, fungible_asset_processor::FungibleAssetProcessor,
nft_metadata_processor::NftMetadataProcessor, objects_processor::ObjectsProcessor,
stake_processor::StakeProcessor, token_processor::TokenProcessor,
token_v2_processor::TokenV2Processor, user_transaction_processor::UserTransactionProcessor,
ProcessingResult, Processor, ProcessorConfig, ProcessorTrait,
monitoring_processor::MonitoringProcessor, nft_metadata_processor::NftMetadataProcessor,
objects_processor::ObjectsProcessor, stake_processor::StakeProcessor,
token_processor::TokenProcessor, token_v2_processor::TokenV2Processor,
user_transaction_processor::UserTransactionProcessor, ProcessingResult, Processor,
ProcessorConfig, ProcessorTrait,
},
schema::ledger_infos,
utils::{
Expand Down Expand Up @@ -769,6 +770,7 @@ pub fn build_processor(config: &ProcessorConfig, db_pool: PgDbPool) -> Processor
ProcessorConfig::FungibleAssetProcessor => {
Processor::from(FungibleAssetProcessor::new(db_pool))
},
ProcessorConfig::MonitoringProcessor => Processor::from(MonitoringProcessor::new(db_pool)),
ProcessorConfig::NftMetadataProcessor(config) => {
Processor::from(NftMetadataProcessor::new(db_pool, config.clone()))
},
Expand Down
Loading