1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
|
// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "sync/engine/process_commit_response_command.h"
#include <cstddef>
#include <set>
#include <string>
#include <vector>
#include "base/basictypes.h"
#include "base/location.h"
#include "sync/engine/syncer_proto_util.h"
#include "sync/engine/syncer_util.h"
#include "sync/sessions/sync_session.h"
#include "sync/syncable/entry.h"
#include "sync/syncable/mutable_entry.h"
#include "sync/syncable/syncable_proto_util.h"
#include "sync/syncable/syncable_read_transaction.h"
#include "sync/syncable/syncable_util.h"
#include "sync/syncable/syncable_write_transaction.h"
#include "sync/util/time.h"
// TODO(vishwath): Remove this include after node positions have
// shifted to completely using Ordinals.
// See http://crbug.com/145412 .
#include "sync/internal_api/public/base/node_ordinal.h"
using std::set;
using std::string;
using std::vector;
using sync_pb::CommitResponse;
namespace syncer {
using sessions::OrderedCommitSet;
using sessions::StatusController;
using sessions::SyncSession;
using syncable::WriteTransaction;
using syncable::MutableEntry;
using syncable::Entry;
using syncable::BASE_VERSION;
using syncable::GET_BY_ID;
using syncable::ID;
using syncable::IS_DEL;
using syncable::IS_DIR;
using syncable::IS_UNAPPLIED_UPDATE;
using syncable::IS_UNSYNCED;
using syncable::PARENT_ID;
using syncable::SERVER_IS_DEL;
using syncable::SERVER_PARENT_ID;
using syncable::SERVER_ORDINAL_IN_PARENT;
using syncable::SERVER_VERSION;
using syncable::SYNCER;
using syncable::SYNCING;
ProcessCommitResponseCommand::ProcessCommitResponseCommand(
const sessions::OrderedCommitSet& commit_set,
const sync_pb::ClientToServerMessage& commit_message,
const sync_pb::ClientToServerResponse& commit_response)
: commit_set_(commit_set),
commit_message_(commit_message),
commit_response_(commit_response) {
}
ProcessCommitResponseCommand::~ProcessCommitResponseCommand() {}
std::set<ModelSafeGroup> ProcessCommitResponseCommand::GetGroupsToChange(
const sessions::SyncSession& session) const {
std::set<ModelSafeGroup> groups_with_commits;
syncable::Directory* dir = session.context()->directory();
syncable::ReadTransaction trans(FROM_HERE, dir);
for (size_t i = 0; i < commit_set_.Size(); ++i) {
groups_with_commits.insert(
GetGroupForModelType(commit_set_.GetModelTypeAt(i),
session.routing_info()));
}
return groups_with_commits;
}
SyncerError ProcessCommitResponseCommand::ModelChangingExecuteImpl(
SyncSession* session) {
SyncerError result = ProcessCommitResponse(session);
ExtensionsActivityMonitor* monitor = session->context()->extensions_monitor();
// This is to be run on one model only: the bookmark model.
if (session->status_controller().HasBookmarkCommitActivity()) {
// If the commit failed, return the data to the ExtensionsActivityMonitor.
if (session->status_controller().
model_neutral_state().num_successful_bookmark_commits == 0) {
monitor->PutRecords(session->extensions_activity());
}
// Clear our cached data in either case.
session->mutable_extensions_activity()->clear();
}
return result;
}
SyncerError ProcessCommitResponseCommand::ProcessCommitResponse(
SyncSession* session) {
syncable::Directory* dir = session->context()->directory();
StatusController* status = session->mutable_status_controller();
const CommitResponse& cr = commit_response_.commit();
const sync_pb::CommitMessage& commit_message = commit_message_.commit();
int transient_error_commits = 0;
int conflicting_commits = 0;
int error_commits = 0;
int successes = 0;
set<syncable::Id> deleted_folders;
OrderedCommitSet::Projection proj = status->commit_id_projection(
commit_set_);
if (!proj.empty()) { // Scope for WriteTransaction.
WriteTransaction trans(FROM_HERE, SYNCER, dir);
for (size_t i = 0; i < proj.size(); i++) {
CommitResponse::ResponseType response_type = ProcessSingleCommitResponse(
&trans,
cr.entryresponse(proj[i]),
commit_message.entries(proj[i]),
commit_set_.GetCommitIdAt(proj[i]),
&deleted_folders);
switch (response_type) {
case CommitResponse::INVALID_MESSAGE:
++error_commits;
break;
case CommitResponse::CONFLICT:
++conflicting_commits;
status->increment_num_server_conflicts();
break;
case CommitResponse::SUCCESS:
// TODO(sync): worry about sync_rate_ rate calc?
++successes;
if (commit_set_.GetModelTypeAt(proj[i]) == BOOKMARKS)
status->increment_num_successful_bookmark_commits();
status->increment_num_successful_commits();
break;
case CommitResponse::OVER_QUOTA:
// We handle over quota like a retry, which is same as transient.
case CommitResponse::RETRY:
case CommitResponse::TRANSIENT_ERROR:
++transient_error_commits;
break;
default:
LOG(FATAL) << "Bad return from ProcessSingleCommitResponse";
}
}
}
MarkDeletedChildrenSynced(dir, &deleted_folders);
int commit_count = static_cast<int>(proj.size());
if (commit_count == successes) {
return SYNCER_OK;
} else if (error_commits > 0) {
return SERVER_RETURN_UNKNOWN_ERROR;
} else if (transient_error_commits > 0) {
return SERVER_RETURN_TRANSIENT_ERROR;
} else if (conflicting_commits > 0) {
// This means that the server already has an item with this version, but
// we haven't seen that update yet.
//
// A well-behaved client should respond to this by proceeding to the
// download updates phase, fetching the conflicting items, then attempting
// to resolve the conflict. That's not what this client does.
//
// We don't currently have any code to support that exceptional control
// flow. Instead, we abort the current sync cycle and start a new one. The
// end result is the same.
return SERVER_RETURN_CONFLICT;
} else {
LOG(FATAL) << "Inconsistent counts when processing commit response";
return SYNCER_OK;
}
}
void LogServerError(const sync_pb::CommitResponse_EntryResponse& res) {
if (res.has_error_message())
LOG(WARNING) << " " << res.error_message();
else
LOG(WARNING) << " No detailed error message returned from server";
}
CommitResponse::ResponseType
ProcessCommitResponseCommand::ProcessSingleCommitResponse(
syncable::WriteTransaction* trans,
const sync_pb::CommitResponse_EntryResponse& server_entry,
const sync_pb::SyncEntity& commit_request_entry,
const syncable::Id& pre_commit_id,
set<syncable::Id>* deleted_folders) {
MutableEntry local_entry(trans, GET_BY_ID, pre_commit_id);
CHECK(local_entry.good());
bool syncing_was_set = local_entry.Get(SYNCING);
local_entry.Put(SYNCING, false);
CommitResponse::ResponseType response = (CommitResponse::ResponseType)
server_entry.response_type();
if (!CommitResponse::ResponseType_IsValid(response)) {
LOG(ERROR) << "Commit response has unknown response type! Possibly out "
"of date client?";
return CommitResponse::INVALID_MESSAGE;
}
if (CommitResponse::TRANSIENT_ERROR == response) {
DVLOG(1) << "Transient Error Committing: " << local_entry;
LogServerError(server_entry);
return CommitResponse::TRANSIENT_ERROR;
}
if (CommitResponse::INVALID_MESSAGE == response) {
LOG(ERROR) << "Error Commiting: " << local_entry;
LogServerError(server_entry);
return response;
}
if (CommitResponse::CONFLICT == response) {
DVLOG(1) << "Conflict Committing: " << local_entry;
return response;
}
if (CommitResponse::RETRY == response) {
DVLOG(1) << "Retry Committing: " << local_entry;
return response;
}
if (CommitResponse::OVER_QUOTA == response) {
LOG(WARNING) << "Hit deprecated OVER_QUOTA Committing: " << local_entry;
return response;
}
if (!server_entry.has_id_string()) {
LOG(ERROR) << "Commit response has no id";
return CommitResponse::INVALID_MESSAGE;
}
// Implied by the IsValid call above, but here for clarity.
DCHECK_EQ(CommitResponse::SUCCESS, response) << response;
// Check to see if we've been given the ID of an existing entry. If so treat
// it as an error response and retry later.
const syncable::Id& server_entry_id =
SyncableIdFromProto(server_entry.id_string());
if (pre_commit_id != server_entry_id) {
Entry e(trans, GET_BY_ID, server_entry_id);
if (e.good()) {
LOG(ERROR) << "Got duplicate id when commiting id: " << pre_commit_id <<
". Treating as an error return";
return CommitResponse::INVALID_MESSAGE;
}
}
if (server_entry.version() == 0) {
LOG(WARNING) << "Server returned a zero version on a commit response.";
}
ProcessSuccessfulCommitResponse(commit_request_entry, server_entry,
pre_commit_id, &local_entry, syncing_was_set, deleted_folders);
return response;
}
const string& ProcessCommitResponseCommand::GetResultingPostCommitName(
const sync_pb::SyncEntity& committed_entry,
const sync_pb::CommitResponse_EntryResponse& entry_response) {
const string& response_name =
SyncerProtoUtil::NameFromCommitEntryResponse(entry_response);
if (!response_name.empty())
return response_name;
return SyncerProtoUtil::NameFromSyncEntity(committed_entry);
}
bool ProcessCommitResponseCommand::UpdateVersionAfterCommit(
const sync_pb::SyncEntity& committed_entry,
const sync_pb::CommitResponse_EntryResponse& entry_response,
const syncable::Id& pre_commit_id,
syncable::MutableEntry* local_entry) {
int64 old_version = local_entry->Get(BASE_VERSION);
int64 new_version = entry_response.version();
bool bad_commit_version = false;
if (committed_entry.deleted() &&
!local_entry->Get(syncable::UNIQUE_CLIENT_TAG).empty()) {
// If the item was deleted, and it's undeletable (uses the client tag),
// change the version back to zero. We must set the version to zero so
// that the server knows to re-create the item if it gets committed
// later for undeletion.
new_version = 0;
} else if (!pre_commit_id.ServerKnows()) {
bad_commit_version = 0 == new_version;
} else {
bad_commit_version = old_version > new_version;
}
if (bad_commit_version) {
LOG(ERROR) << "Bad version in commit return for " << *local_entry
<< " new_id:" << SyncableIdFromProto(entry_response.id_string())
<< " new_version:" << entry_response.version();
return false;
}
// Update the base version and server version. The base version must change
// here, even if syncing_was_set is false; that's because local changes were
// on top of the successfully committed version.
local_entry->Put(BASE_VERSION, new_version);
DVLOG(1) << "Commit is changing base version of " << local_entry->Get(ID)
<< " to: " << new_version;
local_entry->Put(SERVER_VERSION, new_version);
return true;
}
bool ProcessCommitResponseCommand::ChangeIdAfterCommit(
const sync_pb::CommitResponse_EntryResponse& entry_response,
const syncable::Id& pre_commit_id,
syncable::MutableEntry* local_entry) {
syncable::WriteTransaction* trans = local_entry->write_transaction();
const syncable::Id& entry_response_id =
SyncableIdFromProto(entry_response.id_string());
if (entry_response_id != pre_commit_id) {
if (pre_commit_id.ServerKnows()) {
// The server can sometimes generate a new ID on commit; for example,
// when committing an undeletion.
DVLOG(1) << " ID changed while committing an old entry. "
<< pre_commit_id << " became " << entry_response_id << ".";
}
MutableEntry same_id(trans, GET_BY_ID, entry_response_id);
// We should trap this before this function.
if (same_id.good()) {
LOG(ERROR) << "ID clash with id " << entry_response_id
<< " during commit " << same_id;
return false;
}
ChangeEntryIDAndUpdateChildren(trans, local_entry, entry_response_id);
DVLOG(1) << "Changing ID to " << entry_response_id;
}
return true;
}
void ProcessCommitResponseCommand::UpdateServerFieldsAfterCommit(
const sync_pb::SyncEntity& committed_entry,
const sync_pb::CommitResponse_EntryResponse& entry_response,
syncable::MutableEntry* local_entry) {
// We just committed an entry successfully, and now we want to make our view
// of the server state consistent with the server state. We must be careful;
// |entry_response| and |committed_entry| have some identically named
// fields. We only want to consider fields from |committed_entry| when there
// is not an overriding field in the |entry_response|. We do not want to
// update the server data from the local data in the entry -- it's possible
// that the local data changed during the commit, and even if not, the server
// has the last word on the values of several properties.
local_entry->Put(SERVER_IS_DEL, committed_entry.deleted());
if (committed_entry.deleted()) {
// Don't clobber any other fields of deleted objects.
return;
}
local_entry->Put(syncable::SERVER_IS_DIR,
(committed_entry.folder() ||
committed_entry.bookmarkdata().bookmark_folder()));
local_entry->Put(syncable::SERVER_SPECIFICS,
committed_entry.specifics());
local_entry->Put(syncable::SERVER_MTIME,
ProtoTimeToTime(committed_entry.mtime()));
local_entry->Put(syncable::SERVER_CTIME,
ProtoTimeToTime(committed_entry.ctime()));
local_entry->Put(syncable::SERVER_ORDINAL_IN_PARENT,
Int64ToNodeOrdinal(entry_response.position_in_parent()));
// TODO(nick): The server doesn't set entry_response.server_parent_id in
// practice; to update SERVER_PARENT_ID appropriately here we'd need to
// get the post-commit ID of the parent indicated by
// committed_entry.parent_id_string(). That should be inferrable from the
// information we have, but it's a bit convoluted to pull it out directly.
// Getting this right is important: SERVER_PARENT_ID gets fed back into
// old_parent_id during the next commit.
local_entry->Put(syncable::SERVER_PARENT_ID,
local_entry->Get(syncable::PARENT_ID));
local_entry->Put(syncable::SERVER_NON_UNIQUE_NAME,
GetResultingPostCommitName(committed_entry, entry_response));
if (local_entry->Get(IS_UNAPPLIED_UPDATE)) {
// This shouldn't happen; an unapplied update shouldn't be committed, and
// if it were, the commit should have failed. But if it does happen: we've
// just overwritten the update info, so clear the flag.
local_entry->Put(IS_UNAPPLIED_UPDATE, false);
}
}
void ProcessCommitResponseCommand::OverrideClientFieldsAfterCommit(
const sync_pb::SyncEntity& committed_entry,
const sync_pb::CommitResponse_EntryResponse& entry_response,
syncable::MutableEntry* local_entry) {
if (committed_entry.deleted()) {
// If an entry's been deleted, nothing else matters.
DCHECK(local_entry->Get(IS_DEL));
return;
}
// Update the name.
const string& server_name =
GetResultingPostCommitName(committed_entry, entry_response);
const string& old_name =
local_entry->Get(syncable::NON_UNIQUE_NAME);
if (!server_name.empty() && old_name != server_name) {
DVLOG(1) << "During commit, server changed name: " << old_name
<< " to new name: " << server_name;
local_entry->Put(syncable::NON_UNIQUE_NAME, server_name);
}
// The server has the final say on positioning, so apply the absolute
// position that it returns.
if (entry_response.has_position_in_parent()) {
// The SERVER_ field should already have been written.
DCHECK_EQ(entry_response.position_in_parent(),
NodeOrdinalToInt64(local_entry->Get(SERVER_ORDINAL_IN_PARENT)));
// We just committed successfully, so we assume that the position
// value we got applies to the PARENT_ID we submitted.
syncable::Id new_prev = local_entry->ComputePrevIdFromServerPosition(
local_entry->Get(PARENT_ID));
if (!local_entry->PutPredecessor(new_prev)) {
// TODO(lipalani) : Propagate the error to caller. crbug.com/100444.
NOTREACHED();
}
}
}
void ProcessCommitResponseCommand::ProcessSuccessfulCommitResponse(
const sync_pb::SyncEntity& committed_entry,
const sync_pb::CommitResponse_EntryResponse& entry_response,
const syncable::Id& pre_commit_id, syncable::MutableEntry* local_entry,
bool syncing_was_set, set<syncable::Id>* deleted_folders) {
DCHECK(local_entry->Get(IS_UNSYNCED));
// Update SERVER_VERSION and BASE_VERSION.
if (!UpdateVersionAfterCommit(committed_entry, entry_response, pre_commit_id,
local_entry)) {
LOG(ERROR) << "Bad version in commit return for " << *local_entry
<< " new_id:" << SyncableIdFromProto(entry_response.id_string())
<< " new_version:" << entry_response.version();
return;
}
// If the server gave us a new ID, apply it.
if (!ChangeIdAfterCommit(entry_response, pre_commit_id, local_entry)) {
return;
}
// Update our stored copy of the server state.
UpdateServerFieldsAfterCommit(committed_entry, entry_response, local_entry);
// If the item doesn't need to be committed again (an item might need to be
// committed again if it changed locally during the commit), we can remove
// it from the unsynced list. Also, we should change the locally-
// visible properties to apply any canonicalizations or fixups
// that the server introduced during the commit.
if (syncing_was_set) {
OverrideClientFieldsAfterCommit(committed_entry, entry_response,
local_entry);
local_entry->Put(IS_UNSYNCED, false);
}
// Make a note of any deleted folders, whose children would have
// been recursively deleted.
// TODO(nick): Here, commit_message.deleted() would be more correct than
// local_entry->Get(IS_DEL). For example, an item could be renamed, and then
// deleted during the commit of the rename. Unit test & fix.
if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
deleted_folders->insert(local_entry->Get(ID));
}
}
} // namespace syncer
|