forked from jl777/SuperNET
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Stop swaps when "stop" RPC is invoked WIP * Wait for swaps to stop before returning from lp_init. * WIP. * Implemented FileLock. * Adding FileLock to run_maker_swap and run_taker_swap WIP. * WIP. * Check whether the swap was finished on kick start when lock is acquired. * Treat empty or broken file lock as expired. Switch to float for time comparisons. Move swaps file lock related docker tests to separate module.
- Loading branch information
1 parent
aee8d84
commit 0ef0212
Showing
13 changed files
with
1,047 additions
and
141 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| #!/bin/bash | ||
| source userpass | ||
| curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"buy\",\"base\":\"$1\",\"rel\":\"$2\",\"volume\":\"0.1\",\"price\":\"2\"}" | ||
| curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"buy\",\"base\":\"$1\",\"rel\":\"$2\",\"volume\":\"0.1\",\"price\":\"3\"}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| use crate::{now_ms, now_float}; | ||
| use std::path::Path; | ||
|
|
||
| pub struct FileLock<T: AsRef<Path>> { | ||
| /// Filesystem path of the lock file. | ||
| lock_path: T, | ||
| /// The time in seconds after which an outdated lock file can be removed. | ||
| ttl_sec: f64, | ||
| } | ||
|
|
||
| /// Records timestamp to a file contents. | ||
| fn touch(path: &dyn AsRef<Path>, timestamp: u64) -> Result<(), String> { | ||
| std::fs::write(path.as_ref(), timestamp.to_string()).map_err(|e| ERRL!("{:?}", e)) | ||
| } | ||
|
|
||
| /// Attempts to read timestamp recorded to a file | ||
| fn read_timestamp(path: &dyn AsRef<Path>) -> Result<Option<u64>, String> { | ||
| match std::fs::read_to_string(path) { | ||
| Ok(content) => Ok(content.parse().ok()), | ||
| Err(e) => ERR!("{:?}", e) | ||
| } | ||
| } | ||
|
|
||
| impl<T: AsRef<Path>> FileLock<T> { | ||
| pub fn lock(lock_path: T, ttl_sec: f64) -> Result<Option<FileLock<T>>, String> { | ||
| match std::fs::OpenOptions::new().write(true).create_new(true).open(lock_path.as_ref()) { | ||
| Ok(_) => { | ||
| let file_lock = FileLock { lock_path, ttl_sec }; | ||
| try_s!(file_lock.touch()); | ||
| Ok(Some(file_lock)) | ||
| }, | ||
| Err(ref ie) if ie.kind() == std::io::ErrorKind::AlreadyExists => { | ||
| // See if the existing lock is old enough to be discarded. | ||
| match read_timestamp(&lock_path) { | ||
| Ok(Some(lm)) => if now_float() - lm as f64 > ttl_sec { | ||
| let file_lock = FileLock { lock_path, ttl_sec }; | ||
| try_s!(file_lock.touch()); | ||
| Ok(Some(file_lock)) | ||
| } else { | ||
| Ok(None) | ||
| }, | ||
| Ok(None) => { | ||
| let file_lock = FileLock { lock_path, ttl_sec }; | ||
| try_s!(file_lock.touch()); | ||
| Ok(Some(file_lock)) | ||
| }, | ||
| Err(ie) => ERR!("Error checking {:?}: {}", lock_path.as_ref(), ie) | ||
| } | ||
| }, | ||
| Err(ie) => ERR!("Error creating {:?}: {}", lock_path.as_ref(), ie) | ||
| } | ||
| } | ||
|
|
||
| pub fn touch(&self) -> Result<(), String> { | ||
| touch(&self.lock_path, now_ms() / 1000) | ||
| } | ||
| } | ||
|
|
||
| impl<T: AsRef<Path>> Drop for FileLock<T> { | ||
| fn drop(&mut self) { | ||
| let _ = std::fs::remove_file(&self.lock_path); | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod file_lock_tests { | ||
| use std::{ | ||
| thread::sleep, | ||
| time::Duration, | ||
| }; | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_file_lock_should_create_file_and_record_timestamp_and_then_delete_on_drop() { | ||
| let now = now_ms() / 1000; | ||
| let path = Path::new("test1.lock"); | ||
| let lock = FileLock::lock(&path, 1000.).unwrap().unwrap(); | ||
| assert!(path.exists()); | ||
| let timestamp = read_timestamp(&path).unwrap().unwrap(); | ||
| assert!(timestamp >= now); | ||
| drop(lock); | ||
| assert!(!path.exists()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_file_lock_should_return_none_if_lock_acquired() { | ||
| let path = Path::new("test2.lock"); | ||
| let _lock = FileLock::lock(&path, 1000.).unwrap().unwrap(); | ||
| let new_lock = FileLock::lock(&path, 1000.).unwrap(); | ||
| assert!(new_lock.is_none()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_file_lock_should_acquire_if_ttl_expired_and_update_timestamp() { | ||
| let path = Path::new("test3.lock"); | ||
| let _lock = FileLock::lock(&path, 1.).unwrap().unwrap(); | ||
| sleep(Duration::from_secs(2)); | ||
| let old_timestamp = read_timestamp(&path).unwrap(); | ||
| let _new_lock = FileLock::lock(&path, 1.).unwrap().unwrap(); | ||
| let new_timestamp = read_timestamp(&path).unwrap(); | ||
| assert!(new_timestamp > old_timestamp); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_file_lock_should_acquire_if_file_is_empty() { | ||
| let now = now_ms() / 1000; | ||
| let path = Path::new("test4.lock"); | ||
| std::fs::write(&path, &[]).unwrap(); | ||
| let _new_lock = FileLock::lock(&path, 1.).unwrap().unwrap(); | ||
| let timestamp = read_timestamp(&path).unwrap().unwrap(); | ||
| assert!(timestamp >= now); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_file_lock_should_acquire_if_file_does_not_contain_parsable_timestamp() { | ||
| let now = now_ms() / 1000; | ||
| let path = Path::new("test5.lock"); | ||
| std::fs::write(&path, &[12, 13]).unwrap(); | ||
| let _new_lock = FileLock::lock(&path, 1.).unwrap().unwrap(); | ||
| let timestamp = read_timestamp(&path).unwrap().unwrap(); | ||
| assert!(timestamp >= now); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.