Merge pull request #5865 from noobaa/revert-5864-backport_5_2

Revert "Backport to 5.2"

Author: nimrod-becker

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noobaa-core",
-  "version": "5.2.13",
+  "version": "5.2.12",
   "private": true,
   "license": "SEE LICENSE IN LICENSE",
   "description": "",

src/agent/agent.js

@@ -362,21 +362,7 @@ class Agent {
         });
     }
 
-    // refresh the public_ip in background if enough time passed from last time
-    _refresh_public_ip() {
-        const now = Date.now();
-        const GET_PUBLIC_IP_PERIOD = 10 * 60 * 1000; // 10 minutes between retrieve_public_ip
-        if (this.last_retrieve_public_ip && now < this.last_retrieve_public_ip + GET_PUBLIC_IP_PERIOD) return;
-        this.last_retrieve_public_ip = now;
-        net_utils.retrieve_public_ip()
-            .then(public_ip => {
-                this.public_ip = public_ip;
-            })
-            .catch(err => this.dbg.error('got error in _refresh_public_ip', err));
-    }
-
     _init_node() {
-        this._refresh_public_ip();
         return P.resolve()
             .then(() => {
                 if (this.storage_path) {
@@ -883,9 +869,8 @@ class Agent {
             cpu_usage: cpu_percent,
             location_info: this.location_info,
             io_stats: this.block_store && this.block_store.get_and_reset_io_stats(),
-            public_ip: this.public_ip
+            virtual_hosts: this.virtual_hosts
         };
-        this._refresh_public_ip();
         if (this.cloud_info && this.cloud_info.pool_name) {
             reply.pool_name = this.cloud_info.pool_name;
         }
@@ -973,6 +958,12 @@ class Agent {
                 //     }
                 // });
             })
+            .then(() => net_utils.retrieve_public_ip())
+            .then(public_ip => {
+                if (public_ip) {
+                    reply.public_ip = public_ip;
+                }
+            })
             .return(reply);
     }
 

src/util/net_utils.js

@@ -12,7 +12,6 @@ const ip_module = require('ip');
 const P = require('./promise');
 const dbg = require('./debug_module')(__filename);
 const os_utils = require('./os_utils');
-const promise_utils = require('./promise_utils');
 
 const DEFAULT_PING_OPTIONS = {
     timeout: 5000,
@@ -88,19 +87,15 @@ function ip_to_long(ip) {
 }
 
 async function retrieve_public_ip() {
-    const IPIFY_TIMEOUT = 30 * 1000;
     try {
-        return promise_utils.timeout(async () => {
-            const res = await P.fromCallback(callback =>
-                request.get('http://api.ipify.org/', callback)
-            );
-            if (!is_ip(res.body)) {
-                return undefined;
-            }
-            return res.body;
-        }, IPIFY_TIMEOUT);
+        const res = await P.fromCallback(callback =>
+            request.get('http://api.ipify.org/', callback)
+        );
+        if (!is_ip(res.body)) {
+            return undefined;
+        }
+        return res.body;
     } catch (err) {
-        dbg.log0_throttled('failed to ipify', err);
         return undefined;
     }
 }