Revert "#2665: [YSQL] one of Masters crashed when we tried to delete …

…YSQL database" Summary: This reverts commit 6158182. Test Plan: Jenkins Reviewers: timur, alex, dmitry, oleg Reviewed By: oleg Subscribers: ybase, bogdan Differential Revision: https://phabricator.dev.yugabyte.com/D7503
yugabyte · Nov 1, 2019 · 0cf83f9 · 0cf83f9
1 parent 6158182
commit 0cf83f9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 230 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -131,7 +131,6 @@
     <module>yb-loadtester</module>
     <module>yb-jedis-tests</module>
     <module>yb-cdc</module>
-    <module>yb-multiapi</module>
   </modules>
 
   <build>
@@ -354,11 +353,6 @@
         <artifactId>yb-cql</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.yb</groupId>
-        <artifactId>yb-pgsql</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
@@ -498,12 +492,6 @@
         <version>${project.version}</version>
         <type>test-jar</type>
       </dependency>
-      <dependency>
-        <groupId>org.yb</groupId>
-        <artifactId>yb-pgsql</artifactId>
-        <version>${project.version}</version>
-        <type>test-jar</type>
-      </dependency>
 
       <dependency>
         <groupId>org.postgresql</groupId>

diff --git a/java/yb-multiapi/pom.xml b/java/yb-multiapi/pom.xml
diff --git a/java/yb-multiapi/src/test/java/org/yb/multiapi/TestMultiAPI.java b/java/yb-multiapi/src/test/java/org/yb/multiapi/TestMultiAPI.java
diff --git a/java/yb-multiapi/src/test/java/org/yb/multiapi/TestMultiAPIBase.java b/java/yb-multiapi/src/test/java/org/yb/multiapi/TestMultiAPIBase.java
diff --git a/src/yb/master/catalog_manager.cc b/src/yb/master/catalog_manager.cc
@@ -4137,6 +4137,9 @@ Status CatalogManager::DeleteYsqlDatabase(const DeleteNamespaceRequestPB* req,
   {
     TRACE("Removing from maps");
     std::lock_guard<LockType> l_map(lock_);
+    CHECK(FindPtrOrNull(namespace_names_map_, database->name()) == nullptr)
+      << "YSQL database name should not be included in namespace_names_map_. "
+      << "If included, its name must be removed from map here when dropping";
     if (namespace_ids_map_.erase(database->id()) < 1) {
       PANIC_RPC(rpc, "Could not remove namespace from map, name=" + l->data().name());
     }