From: netinetwalker <manuel.hilbing@googlemail.com>
Date: Fri, 25 Sep 2015 22:26:52 +0000 (+0200)
Subject: redis: throw error if block request failed
X-Git-Tag: 0.4.14~675
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=524a7656e3e5cd671b05c13e2ad69cb84bad0423;p=oweals%2Fminetest.git

redis: throw error if block request failed

Fixes #3196. Before, we didn't throw an error, and the engine thought the
block isn't occupied. But in fact it might be that redis is still loading,
and the block does exist in the database. The result was a cheesy map.
---

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index cc4e5bade..d7f537977 100644
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -118,12 +118,21 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
 		freeReplyObject(reply);
 		return str;
 	}
-	case REDIS_REPLY_ERROR:
-		errorstream << "WARNING: loadBlock: loading block " << PP(pos)
-			<< " failed: " << reply->str << std::endl;
+	case REDIS_REPLY_ERROR: {
+		std::string errstr = reply->str;
+		freeReplyObject(reply);
+		errorstream << "loadBlock: loading block " << PP(pos)
+			<< " failed: " << errstr << std::endl;
+		throw FileNotGoodException(std::string(
+			"Redis command 'HGET %s %s' errored: ") + errstr);
+	}
 	}
+	errorstream << "loadBlock: loading block " << PP(pos)
+		<< " returned invalid reply type " << reply->type
+		<< ": " << reply->str << std::endl;
 	freeReplyObject(reply);
-	return "";
+	throw FileNotGoodException(std::string(
+		"Redis command 'HGET %s %s' gave invalid reply."));
 }
 
 bool Database_Redis::deleteBlock(const v3s16 &pos)