Hotfix/2.8.1 #13

bmeike · 2020-10-28T20:51:54Z

There are two commits here:

This is the change that is driving 2.8.1: backward compatible default db directory. This is the only code change in the product.
Fix the packaging for Java. We had to do this by hand, in the 2.8.0 release. This puts the support libraries into separate directories, by category

pasin · 2020-10-28T21:32:41Z

android/main/java/com/couchbase/lite/internal/CouchbaseLiteInternal.java

@@ -143,7 +141,7 @@ public static Context getContext() {
 @NonNull
 public static String makeDbPath(@Nullable String rootDir) {
 requireInit("Can't create DB path");
- return verifyDir((rootDir != null) ? new File(rootDir) : new File(getContext().getFilesDir(), DB_DIR_NAME));
+ return verifyDir((rootDir != null) ? new File(rootDir) : getContext().getFilesDir());


The code before fixing and the code after fix could produce different db path. Is this backward compat with 2.8.0 (e.g. app that is used 2.8.0 without using 2.7.0 before)?

It is not backwards compatible with 2.8.0. It is compatible with 2.7.x.
If we have to make it compatible with 2.8.0 -- not an unreasonable suggestion -- we should keep the new directory an locate and copy existing dbs. This seems like pretty big change to me. Again, though, not unreasonable. I think a better suggestion would be to get this out quickly and to advise people not to use 2.8.0.

Agreed. We should make sure to put this into the release note.

Is unlisting 2.8.0 an option?

I don't know. That is a discussion we need to have. I don't think there is a way to be 100% backwards compatible. The most common case for 2.8.1 is going to be that there are two dbs with identical names one in the root directory, one is .couchbase. Deciding which to keep probably requires direct human intervention.

pasin · 2020-10-28T21:34:23Z

tools/fetch_litecore.sh

+ rm -f "${SUPPORT_DIR}/libicu/"libicutest*
+
+ mkdir "${SUPPORT_DIR}/libz" 
+ mv -f lib/libz*.so* "${SUPPORT_DIR}/libz" || true # Only on CentOS6


I remember that there is one .a copied to the support directory as well. Will this fix exclude copying .a file?

Good memory! Yes. The only .a is libz.a, so the pattern libz*.so* will not pick it up.

pasin · 2020-10-30T17:28:49Z

common/main/java/com/couchbase/lite/AbstractDatabase.java

+ // directory and leave well enough alone.
+ // It is *always* possible to use 2.8 database, by specifying
+ // its directory explicitly.
+ if (exists(dbName, defaultDir)) { return; }


It might be a good to put some log here?

Sure! What would you like logged?

I take this back. I think this is normal case not error case so no need to log. Sorry for confusion.

pasin · 2020-10-30T17:35:31Z

common/main/java/com/couchbase/lite/AbstractDatabase.java

+
+ // This database is in the 2.8 default dir but not in the real
+ // default dir. Copy it to where it belongs.
+ Database.copy(getDatabaseFile(twoDotEightDefaultDir, dbName), dbName, new DatabaseConfiguration());


If this operation failed, can we also rollback the partial copy?

Ok. So delete the copy if the operation fails. Then we will create a new DB and the data in the old db will still be there. Is that what you want?

Here is what I mean,

The partial copy will be rollbacked which mean delete.

The exception will be thrown.

Ok. If copying the database fails, I will delete the partial copy and throw an exception.
That means that any subsequent attempt to open the DB will also throw an exception... the application now has a poison pill. Ok?

The upgrade / migration process always has some corner cases that I hope those will not happen.

borrrden

I'd like to see a test for this. Looks like it can be simulated by creating things by specifying the "wrong" default directory and then viewing what happens when a database is created using no specified directory.

bmeike · 2020-10-31T19:02:49Z

Yeah. I'm with you. There was consensus that "blake should do nothing [no tests]" but the number of errors in the fix and the likelihood that QE will be able to figure out how to drive all of these cases convince me that they need to be there.

There are now tests for the following conditions:

open a db that exists in the 2.8.1/2.x<8 default directory. This is probably redundant. FWIW, it would not have caught the original bug
open a db that exists only in the 2.8.0 default directory
open a db when both # 1 and # 2 exist: the one in the 2.8.1/2.x<8 directory is preferred.
like # 2, except the copy fails: The 2.8.0 db remains. The 2.8.1/2.x<7 copy is deleted. An exception is thrown.
like # 2 but the database is encrypted.

bmeike · 2020-10-31T19:13:42Z

Since this is urgent and since I've changed only test code, since approvals, I'm merging this

bmeike added 2 commits October 28, 2020 11:56

CBL-1406: use backwards compatible root directory

5b22f69

Fix java packaging

bbd57c4

bmeike requested review from pasin, borrrden and djpongh October 28, 2020 20:52

pasin reviewed Oct 28, 2020

View reviewed changes

pasin approved these changes Oct 28, 2020

View reviewed changes

borrrden approved these changes Oct 28, 2020

View reviewed changes

bmeike added 3 commits October 29, 2020 17:11

Copy 2.8 non-conflicting DB to old location

a4ca149

Fix default directory check

dbd3e82

Fix 'copy' call

479cfe2

bmeike requested review from pasin and borrrden October 30, 2020 17:21

pasin requested changes Oct 30, 2020

View reviewed changes

Per code review

63b774f

bmeike requested a review from pasin October 30, 2020 18:47

pasin approved these changes Oct 30, 2020

View reviewed changes

Handle Encrypted DB

a24fb82

borrrden approved these changes Oct 30, 2020

View reviewed changes

Add automated tests

3ea62c2

bmeike merged commit 8686d96 into android/release/hydrogen Oct 31, 2020

bmeike deleted the hotfix/2.8.1 branch November 4, 2020 00:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hotfix/2.8.1 #13

Hotfix/2.8.1 #13

bmeike commented Oct 28, 2020 •

edited

Loading

pasin Oct 28, 2020

bmeike Oct 28, 2020

pasin Oct 28, 2020

borrrden Oct 28, 2020

bmeike Oct 29, 2020

pasin Oct 28, 2020

bmeike Oct 28, 2020 •

edited

Loading

pasin Oct 30, 2020

bmeike Oct 30, 2020

pasin Oct 30, 2020

pasin Oct 30, 2020

bmeike Oct 30, 2020

pasin Oct 30, 2020

bmeike Oct 30, 2020

pasin Oct 30, 2020

borrrden left a comment

bmeike commented Oct 31, 2020 •

edited

Loading

bmeike commented Oct 31, 2020

Hotfix/2.8.1 #13

Hotfix/2.8.1 #13

Conversation

bmeike commented Oct 28, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmeike Oct 28, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

borrrden left a comment

Choose a reason for hiding this comment

bmeike commented Oct 31, 2020 • edited Loading

bmeike commented Oct 31, 2020

bmeike commented Oct 28, 2020 •

edited

Loading

bmeike Oct 28, 2020 •

edited

Loading

bmeike commented Oct 31, 2020 •

edited

Loading