Reverted 5641,5645. Fix root cause of upgrade error #5654
Conversation
apache#5641)" This reverts commit 4999191.
…ing Fate (apache#5645)" This reverts commit c63a556.
This change reverts commits 242438a from apache#5641 and 963150d from apache#5645 and fixes the root cause of the issues, which was that the scanref and fate tables were not being created during the upgrade.
dlmarion
changed the title
| expect(zrw.putPersistentData(isA(String.class), isA(byte[].class), isA(NodeExistsPolicy.class))) | ||
| .andReturn(true).times(7); | ||
| expect(context.getPropStore()).andReturn(store).atLeastOnce(); | ||
| expect(store.exists(isA(TablePropKey.class))).andReturn(false).atLeastOnce(); | ||
| store.create(isA(TablePropKey.class), isA(Map.class)); | ||
| expectLastCall().once(); |
There was a problem hiding this comment.
You could probably use anyObject() for these parameters. It would avoid the need to suppress the warning, I think. Or, you could get more specific, and use eq() to pass specific objects. For the Array, you could pass a more specific matcher.
At the very least, a comment to explain where the count of 7 comes from would be useful (3 for name/conf/status for 2 tables, plus 1 for the mapping update? or something like that)
| Namespace.ACCUMULO.id(), SystemTables.FATE.tableName(), TableState.ONLINE, | ||
| ZooUtil.NodeExistsPolicy.FAIL); | ||
| } catch (InterruptedException | KeeperException ex) { | ||
| Thread.currentThread().interrupt(); |
There was a problem hiding this comment.
I don't think you need to re-set the interrupted flag here, because you're exiting the current thread in the next line with the ISE. I'm also wondering if this boilerplate exception handling can be pushed into the preparePre4_0NewTableState method, so we can just inline this method. The namespace, nodeexistspolicy, and online state can probably all be inlined.
2 participants
This change reverts commits 242438a from #5641
and 963150d from #5645 and fixes the root
cause of the issues, which was that the scanref and fate tables were not
being created during the upgrade.