Resolves issue FoundationDB#146: Registered new command for hostInfo

drkannan · Aug 14, 2019 · f23ceff · f23ceff
1 parent 239aa37
commit f23ceff
Show file tree

Hide file tree

Showing 6 changed files with 671 additions and 1 deletion.
diff --git a/src/ExtCmd.actor.cpp b/src/ExtCmd.actor.cpp
@@ -498,6 +498,30 @@ struct RenameCollectionCmd {
 };
 REGISTER_CMD(RenameCollectionCmd, "renamecollection");
 
+struct HostInfoCmd {
+	static const char* name;
+	static Future<Reference<ExtMsgReply>> call(Reference<ExtConnection> ec,
+	                                           Reference<ExtMsgQuery> query,
+	                                           Reference<ExtMsgReply> reply) {
+		bson::HOSTINFO hostInfo;
+		bson::BSONObj systemInfo = hostInfo.getSystemInfo();
+		bson::BSONObj osInfo = hostInfo.getOsInfo();
+		bson::BSONObj extraInfo = hostInfo.getExtraInfo();
+		try {
+			if (!systemInfo.isEmpty() || !osInfo.isEmpty() || !extraInfo.isEmpty()) {
+				reply->addDocument(
+				    BSON("system" << systemInfo << "os" << osInfo << "extra" << extraInfo << "ok" << 1.0));
+			} else {
+				throw unable_to_fetch_the_hostinfo();
+			}
+		} catch (Error& e) {
+			reply->addDocument(BSON("$err" << e.what() << "code" << e.code() << "ok" << 1.0));
+		}
+		return Future<Reference<ExtMsgReply>>(reply);
+	}
+};
+REGISTER_CMD(HostInfoCmd, "hostinfo");
+
 ACTOR static Future<Reference<ExtMsgReply>> getStreamCount(Reference<ExtConnection> ec,
                                                            Reference<ExtMsgQuery> query,
                                                            Reference<ExtMsgReply> reply) {

diff --git a/src/error_definitions.h b/src/error_definitions.h
@@ -76,6 +76,7 @@ DOCLAYER_ERROR(multiple_index_construction, 20004, "tried to create multiple ind
 DOCLAYER_ERROR(unique_index_background_construction, 20005, "tried to create unique indexes in background");
 DOCLAYER_ERROR(empty_set_on_insert, 20009, "$setOnInsert is empty");
 DOCLAYER_ERROR(cant_modify_id, 20010, "You may not modify '_id' in an update");
+DOCLAYER_ERROR(unable_to_fetch_the_hostinfo, 20011, "Unable to fetch the HostInfo");
 
 DOCLAYER_ERROR(update_operator_empty_parameter,
                26840,

diff --git a/thirdparty/bson-cpp/CMakeLists.txt b/thirdparty/bson-cpp/CMakeLists.txt
@@ -29,6 +29,8 @@ add_library(bsoncpp
         "util/hex.h"
         "util/misc.h"
         "util/optime.h"
+        "system_info.h"
+        "system_info.cpp"
         "util/time_support.h"
         )
 

diff --git a/thirdparty/bson-cpp/bson.h b/thirdparty/bson-cpp/bson.h
@@ -40,4 +40,5 @@
 #include "bsonobjbuilder.h"
 #include "bsonobjiterator.h"
 #include "bson-inl.h"
-#include "bson_db.h"
+#include "bson_db.h"
+#include "system_info.h"