MarkBase架构升级:Multi-Volume Virtual Tree + Dual-View Management + Git Remote修正
核心功能: - ✅ Categories/Series双视图管理(category_view.rs + import_markdown.rs) - ✅ FUSE Multi-Volume支持(tree_type参数) - ✅ SSH/SFTP/SCP/rsync协议完整实现(4042行) - ✅ NFS/SMB Module Phase 1-3完成 - ✅ Archive Module Phase 1-4完成(2916行) - ✅ Download Center API完整实现 - ✅ S3兼容API实现(560行) Git配置修正: - ✅ 删除错误origin(gitea.momentry.ddns.net) - ✅ 删除m5max128(指向机器名) - ✅ 设置origin = m5max128gitea.momentry.ddns.net/admin/markbase - ✅ 设置m4minigitea = m4minigitea.momentry.ddns.net/warren/markbase 数据清理: - ✅ 删除38个临时SQLite(保留accusys.sqlite、demo.sqlite) - ✅ 删除.bak、test_*.bin、调试脚本等临时文件 - ✅ 删除临时目录(build/、download files/、raid_test/等) - ✅ 更新.gitignore排除临时文件 架构优化: - 52个文件修改,2434行新增,4739行删除 - Workspace成员整合(16个crate) - 数据库状态:accusys.sqlite保留(主demo测试) 远程同步: - ✅ 准备推送到m5max128gitea(远程Gitea) - ✅ 准备推送到m4minigitea(本地Gitea)
This commit is contained in:
59
rust-iscsi-initiator/src/bin/iscsi-inq.rs
Normal file
59
rust-iscsi-initiator/src/bin/iscsi-inq.rs
Normal file
@@ -0,0 +1,59 @@
|
||||
use rust_iscsi_initiator::connection::IscsiConnection;
|
||||
use rust_iscsi_initiator::tools::inquiry;
|
||||
use std::env;
|
||||
|
||||
/// iscsi-inq tool - Inquiry SCSI device
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
env_logger::init();
|
||||
|
||||
let args: Vec<String> = env::args().collect();
|
||||
|
||||
if args.len() < 2 {
|
||||
println!("Usage: iscsi-inq <iscsi-url>");
|
||||
println!("Example: iscsi-inq iscsi://192.168.1.1:3260/iqn.target/0");
|
||||
return;
|
||||
}
|
||||
|
||||
let url = &args[1];
|
||||
|
||||
println!("Inquiring device: {}", url);
|
||||
|
||||
// Parse URL (simplified)
|
||||
let parts: Vec<&str> = url.split('/').collect();
|
||||
if parts.len() < 5 {
|
||||
eprintln!("Invalid URL format");
|
||||
return;
|
||||
}
|
||||
|
||||
let portal = parts[2];
|
||||
let target = parts[3];
|
||||
let lun: u64 = parts[4].parse().unwrap_or(0);
|
||||
|
||||
match IscsiConnection::connect(portal).await {
|
||||
Ok(mut conn) => {
|
||||
match conn.login("iqn.initiator", target).await {
|
||||
Ok(_) => match inquiry(&mut conn, lun).await {
|
||||
Ok(inquiry) => {
|
||||
println!("Device Information:");
|
||||
println!(" Type: {}", inquiry.peripheral_type);
|
||||
println!(" Vendor: {}", inquiry.vendor_id);
|
||||
println!(" Product: {}", inquiry.product_id);
|
||||
println!(" Revision: {}", inquiry.product_rev);
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Inquiry error: {}", e);
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
eprintln!("Login error: {}", e);
|
||||
}
|
||||
}
|
||||
|
||||
conn.close().await.ok();
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Connection error: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
47
rust-iscsi-initiator/src/bin/iscsi-ls.rs
Normal file
47
rust-iscsi-initiator/src/bin/iscsi-ls.rs
Normal file
@@ -0,0 +1,47 @@
|
||||
use rust_iscsi_initiator::discovery::Discovery;
|
||||
use std::env;
|
||||
|
||||
/// iscsi-ls tool - List iSCSI targets
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
env_logger::init();
|
||||
|
||||
let args: Vec<String> = env::args().collect();
|
||||
|
||||
if args.len() < 2 {
|
||||
println!("Usage: iscsi-ls <portal-address>");
|
||||
println!("Example: iscsi-ls 192.168.1.1:3260");
|
||||
return;
|
||||
}
|
||||
|
||||
let portal = &args[1];
|
||||
|
||||
println!("Discovering targets at {}...", portal);
|
||||
|
||||
let mut discovery = Discovery::new();
|
||||
|
||||
match discovery.connect(portal).await {
|
||||
Ok(_) => {
|
||||
match discovery.send_targets().await {
|
||||
Ok(targets) => {
|
||||
if targets.is_empty() {
|
||||
println!("No targets found");
|
||||
} else {
|
||||
println!("Found {} targets:", targets.len());
|
||||
for target in targets {
|
||||
println!(" {}", target);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Discovery error: {}", e);
|
||||
}
|
||||
}
|
||||
|
||||
discovery.disconnect().await.ok();
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Connection error: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
79
rust-iscsi-initiator/src/bin/iscsi-perf.rs
Normal file
79
rust-iscsi-initiator/src/bin/iscsi-perf.rs
Normal file
@@ -0,0 +1,79 @@
|
||||
use rust_iscsi_initiator::connection::IscsiConnection;
|
||||
use rust_iscsi_initiator::pdu::{IscsiPdu, Opcode};
|
||||
use rust_iscsi_initiator::scsi::ScsiCommand;
|
||||
use std::env;
|
||||
use std::time::Instant;
|
||||
|
||||
/// iscsi-perf tool - Performance test
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
env_logger::init();
|
||||
|
||||
let args: Vec<String> = env::args().collect();
|
||||
|
||||
if args.len() < 2 {
|
||||
println!("Usage: iscsi-perf <iscsi-url>");
|
||||
println!("Example: iscsi-perf iscsi://192.168.1.1:3260/iqn.target/0");
|
||||
return;
|
||||
}
|
||||
|
||||
let url = &args[1];
|
||||
|
||||
println!("Performance test: {}", url);
|
||||
|
||||
// Parse URL
|
||||
let parts: Vec<&str> = url.split('/').collect();
|
||||
if parts.len() < 5 {
|
||||
eprintln!("Invalid URL format");
|
||||
return;
|
||||
}
|
||||
|
||||
let portal = parts[2];
|
||||
let target = parts[3];
|
||||
let lun: u64 = parts[4].parse().unwrap_or(0);
|
||||
|
||||
match IscsiConnection::connect(portal).await {
|
||||
Ok(mut conn) => {
|
||||
match conn.login("iqn.initiator", target).await {
|
||||
Ok(_) => {
|
||||
println!("Connected, testing performance...");
|
||||
|
||||
// Test read performance
|
||||
let iterations = 100;
|
||||
let start = Instant::now();
|
||||
|
||||
for i in 0..iterations {
|
||||
let cmd = ScsiCommand::Read10 {
|
||||
lba: i,
|
||||
transfer_length: 1,
|
||||
};
|
||||
let cdb = cmd.encode_cdb();
|
||||
|
||||
let mut pdu = IscsiPdu::new(Opcode::ScsiCmd);
|
||||
pdu.lun = lun;
|
||||
pdu.set_data(bytes::Bytes::from(cdb));
|
||||
|
||||
conn.send_pdu(&pdu).await.ok();
|
||||
conn.recv_pdu().await.ok();
|
||||
}
|
||||
|
||||
let elapsed = start.elapsed();
|
||||
let ops_per_sec = iterations as f64 / elapsed.as_secs_f64();
|
||||
|
||||
println!("Performance Results:");
|
||||
println!(" Operations: {}", iterations);
|
||||
println!(" Time: {:.2}s", elapsed.as_secs_f64());
|
||||
println!(" Ops/sec: {:.2}", ops_per_sec);
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Login error: {}", e);
|
||||
}
|
||||
}
|
||||
|
||||
conn.close().await.ok();
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Connection error: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user