Freeze rust toolchain + add curl to dockerfile + fix bootstrapping (#1026)

folex · web-flow · commit 877958c7a77c · 2021-02-04T16:31:07.000+03:00
diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2021-01-28
           profile: minimal
           override: true
           components: rustfmt, rust-src
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,8 @@
 from bitnami/minideb:latest
 
+run apt-get update
+run apt-get install curl --yes
+
 ARG exe=
 ARG config=
 
diff --git a/crates/server-config/src/defaults.rs b/crates/server-config/src/defaults.rs
@@ -70,7 +70,7 @@ pub fn default_particle_queue_buffer_size() -> usize {
 }
 
 pub fn default_particle_processor_parallelism() -> usize {
-    num_cpus::get() * 4
+    32
 }
 
 pub fn default_script_storage_timer_resolution() -> Duration {
diff --git a/crates/test-utils/src/connected_client.rs b/crates/test-utils/src/connected_client.rs
@@ -179,7 +179,7 @@ impl ConnectedClient {
 
     /// Wait for a particle with specified `particle_id`, and read "op" "return" result from it
     pub fn wait_particle_args(&mut self, particle_id: String) -> anyhow::Result<Vec<JValue>> {
-        let mut max = 10;
+        let mut max = 100;
         loop {
             max -= 1;
             if max <= 0 {
diff --git a/deploy/deployment_config.json b/deploy/deployment_config.json
@@ -13,10 +13,19 @@
       "159.89.2.70",
       "157.230.98.75"
     ],
-    "branch": "script_storage_list",
-    "bootstrap": "138.197.177.2",
+    "branch": "latest",
+    "bootstrap": "165.227.164.206",
     "nodes": [
-      "138.197.177.2"
+      "165.227.164.206",
+      "138.197.189.50",
+      "157.230.23.49",
+      "159.65.126.102",
+      "142.93.169.49",
+      "139.59.148.53",
+      "206.81.30.129",
+      "157.230.98.51",
+      "159.89.2.70",
+      "157.230.98.75"
     ],
     "caddy": {
       "nodes": [
diff --git a/deploy/fluence.yml b/deploy/fluence.yml
@@ -11,89 +11,89 @@ services:
       - fluence-1:/.fluence
     environment:
       RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
 ,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,particle_server::behaviour::identify=info,libp2p_mplex=info,libp2p_identify=info,walrus=info,particle_protocol::libp2p_protocol::upgrade=info"
       WASM_LOG: "info"
 
-  fluence-2:
-    image: fluencelabs/fluence:$BRANCH
-    restart: always
-    ports:
-      - "7002:7002" # Node service
-      - "9002:9002" # Peer service
-    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7002 -w 9002"
-    volumes:
-      - fluence-2:/.fluence
-    environment:
-      RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
-,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
-      WASM_LOG: "info"
-
-  fluence-3:
-    image: fluencelabs/fluence:$BRANCH
-    restart: always
-    ports:
-      - "7003:7003" # Node service
-      - "9003:9003" # Peer service
-    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7003 -w 9003"
-    volumes:
-      - fluence-3:/.fluence
-    environment:
-      RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
-,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
-      WASM_LOG: "info"
-
-  fluence-4:
-    image: fluencelabs/fluence:$BRANCH
-    restart: always
-    ports:
-      - "7004:7004" # Node service
-      - "9004:9004" # Peer service
-    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7004 -w 9004"
-    volumes:
-      - fluence-4:/.fluence
-    environment:
-      RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
-,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
-      WASM_LOG: "info"
-
-  fluence-5:
-    image: fluencelabs/fluence:$BRANCH
-    restart: always
-    ports:
-      - "7005:7005" # Node service
-      - "9005:9005" # Peer service
-    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7005 -w 9005"
-    volumes:
-      - fluence-5:/.fluence
-    environment:
-      RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
-,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
-      WASM_LOG: "info"
-
-  fluence-6:
-    image: fluencelabs/fluence:$BRANCH
-    restart: always
-    ports:
-      - "7006:7006" # Node service
-      - "9006:9006" # Peer service
-    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7006 -w 9006"
-    volumes:
-      - fluence-6:/.fluence
-    environment:
-      RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine=debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
-  ,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
-      WASM_LOG: "info"
+#  fluence-2:
+#    image: fluencelabs/fluence:$BRANCH
+#    restart: always
+#    ports:
+#      - "7002:7002" # Node service
+#      - "9002:9002" # Peer service
+#    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7002 -w 9002"
+#    volumes:
+#      - fluence-2:/.fluence
+#    environment:
+#      RUST_BACKTRACE: "full"
+#      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+#,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+#      WASM_LOG: "info"
+#
+#  fluence-3:
+#    image: fluencelabs/fluence:$BRANCH
+#    restart: always
+#    ports:
+#      - "7003:7003" # Node service
+#      - "9003:9003" # Peer service
+#    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7003 -w 9003"
+#    volumes:
+#      - fluence-3:/.fluence
+#    environment:
+#      RUST_BACKTRACE: "full"
+#      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+#,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+#      WASM_LOG: "info"
+#
+#  fluence-4:
+#    image: fluencelabs/fluence:$BRANCH
+#    restart: always
+#    ports:
+#      - "7004:7004" # Node service
+#      - "9004:9004" # Peer service
+#    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7004 -w 9004"
+#    volumes:
+#      - fluence-4:/.fluence
+#    environment:
+#      RUST_BACKTRACE: "full"
+#      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+#,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+#      WASM_LOG: "info"
+#
+#  fluence-5:
+#    image: fluencelabs/fluence:$BRANCH
+#    restart: always
+#    ports:
+#      - "7005:7005" # Node service
+#      - "9005:9005" # Peer service
+#    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7005 -w 9005"
+#    volumes:
+#      - fluence-5:/.fluence
+#    environment:
+#      RUST_BACKTRACE: "full"
+#      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+#,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+#      WASM_LOG: "info"
+#
+#  fluence-6:
+#    image: fluencelabs/fluence:$BRANCH
+#    restart: always
+#    ports:
+#      - "7006:7006" # Node service
+#      - "9006:9006" # Peer service
+#    command: "-c /Config.toml -k /node.key -b $BOOTSTRAP -x $HOST -t 7006 -w 9006"
+#    volumes:
+#      - fluence-6:/.fluence
+#    environment:
+#      RUST_BACKTRACE: "full"
+#      RUST_LOG: "info,aquamarine=info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info
+#  ,cranelift_codegen=info,wasmer_wasi=info,async_io=info,polling=info,wasmer_interface_types_fl=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+#      WASM_LOG: "info"
 
 volumes:
   fluence-1:
-  fluence-2:
-  fluence-3:
-  fluence-4:
-  fluence-5:
-  fluence-6:
+#  fluence-2:
+#  fluence-3:
+#  fluence-4:
+#  fluence-5:
+#  fluence-6:
diff --git a/deploy/fluence_bootstrap.yml b/deploy/fluence_bootstrap.yml
@@ -12,7 +12,7 @@ services:
       - fluence_bootstrap:/.fluence
     environment:
       RUST_BACKTRACE: "full"
-      RUST_LOG: "debug,aquamarine::actor=debug,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
+      RUST_LOG: "info,aquamarine::actor=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,libp2p_mplex=info,libp2p_identify=info,walrus=info"
       WASM_LOG: "info"
 
 volumes:
diff --git a/particle-node/src/main.rs b/particle-node/src/main.rs
@@ -50,6 +50,21 @@ fn main() -> anyhow::Result<()> {
     // TODO: maybe set log level via flag?
     env_logger::builder().format_timestamp_micros().init();
 
+    log::info!(
+        r#"
++--------------------------------------------+
+| Hello from Fluence Team.                   |
+| If you encounter any troubles with         |
+| node operation, please update the node     |
+| via                                        |
+|     docker pull fluencelabs/fluence:latest |
+|                                            |
+| or contact us at                           |
+| github.com/fluencelabs/fluence/discussions |
++--------------------------------------------+
+    "#
+    );
+
     let arg_matches = App::new("Fluence protocol server")
         .version(VERSION)
         .author(AUTHORS)
diff --git a/particle-node/src/network_api.rs b/particle-node/src/network_api.rs
@@ -77,23 +77,12 @@ impl NetworkApi {
         self.connectivity.clone()
     }
 
-    pub async fn connect_bootstraps(pool: ConnectionPoolApi, bootstrap_nodes: HashSet<Multiaddr>) {
-        stream::iter(bootstrap_nodes.clone())
-            .for_each_concurrent(None, |addr| {
-                let cp = pool.clone();
-                async move {
-                    if let Some(contact) = cp.dial(addr).await {
-                        log::info!("Connected to bootstrap {}", contact)
-                    }
-                }
-            })
-            .await;
-    }
-
+    /// Dial bootstraps, and then re-dial on each disconnection
     pub async fn reconnect_bootstraps(
         pool: ConnectionPoolApi,
         bootstrap_nodes: HashSet<Multiaddr>,
     ) {
+        let bootstraps = iter(bootstrap_nodes.clone().into_iter().collect::<Vec<_>>());
         let events = pool.lifecycle_events();
         let disconnections = {
             events
@@ -117,18 +106,19 @@ impl NetworkApi {
         let reconnect = move |pool: ConnectionPoolApi, addr: Multiaddr| async move {
             let mut delay = Duration::from_secs(0);
             loop {
-                if pool.dial(addr.clone()).await.is_some() {
-                    log::info!("bootstrap reconnected");
+                if let Some(contact) = pool.dial(addr.clone()).await {
+                    log::info!("Connected bootstrap {}", contact);
                     break;
                 }
 
                 delay = min(delay + delta, max);
-                log::info!("can't connect to bootstrap (pause for {})", pretty(delay));
+                log::info!("can't connect bootstrap {} (pause {})", addr, pretty(delay));
                 sleep(delay).await;
             }
         };
 
-        disconnections
+        bootstraps
+            .chain(disconnections)
             .for_each_concurrent(None, |addr| reconnect(pool.clone(), addr))
             .await;
     }
@@ -151,10 +141,6 @@ impl NetworkApi {
             } = self;
 
             let pool = connectivity.connection_pool.clone();
-            spawn(Self::connect_bootstraps(
-                pool.clone(),
-                bootstrap_nodes.clone(),
-            ));
             spawn(Self::reconnect_bootstraps(pool, bootstrap_nodes));
 
             particle_stream
diff --git a/particle-node/tests/script_storage.rs b/particle-node/tests/script_storage.rs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-use test_utils::{make_swarms, ConnectedClient};
+use test_utils::{enable_logs, make_swarms, ConnectedClient};
 
 use fstrings::f;
 use maplit::hashmap;
@@ -51,6 +51,8 @@ fn stream_hello() {
 
 #[test]
 fn remove_script() {
+    enable_logs();
+
     let swarms = make_swarms(1);
 
     let mut client = ConnectedClient::connect_to(swarms[0].1.clone()).expect("connect client");
@@ -226,6 +228,8 @@ fn autoremove_failed() {
 
 #[test]
 fn remove_script_unauth() {
+    enable_logs();
+
     let swarms = make_swarms(1);
 
     let mut client = ConnectedClient::connect_to(swarms[0].1.clone()).expect("connect client");

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ pub fn default_particle_queue_buffer_size() -> usize {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`pub fn default_particle_processor_parallelism() -> usize {`
`73`		`- num_cpus::get() * 4`
	`73`	`+ 32`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`pub fn default_script_storage_timer_resolution() -> Duration {`